Merge branch 'master' into new-website

# Conflicts:
#	index.html

2 files changed, 3 insertions, 121 deletions

diff --git a/src/server/gf-server.cabal b/src/server/gf-server.cabal
deleted file mode 100644
index 211f11683..000000000
--- a/src/server/gf-server.cabal
+++ /dev/null
@@ -1,118 +0,0 @@
-name: gf-server
-version: 1.0
-cabal-version: >= 1.8
-build-type: Custom
-license: GPL
-license-file: ../../LICENSE
-synopsis: FastCGI Server for Grammatical Framework
-
-flag content
-  Description:
-      Build content service (requires fastcgi and hsql-mysql packages)
-      (In Ubuntu: apt-get install libghc-fastcgi-dev libghc-hsql-mysql-dev)
-  Default:     False
-
-flag http
-  Description: Build pgf-http (deprecated, replaced by gf -server)
-  Default: False
-
-flag fastcgi
-  Description: Build librar & pgf-service executable with fastcgi support
-  Default: True
-
-flag c-runtime
-  Description: Include functionality from the C run-time library (which must be installed already)
-  Default:     False
-
-flag network-uri
-   description: Get Network.URI from the network-uri package
-   default: True
-
-Library
-  exposed-modules: PGFService FastCGIUtils CGIUtils ServeStaticFile RunHTTP Cache
-  other-modules: URLEncoding CGI Fold
-  hs-source-dirs: . transfer
-
-  if flag(fastcgi)
-    build-depends: fastcgi >= 3001.0.2.2
-       -- Install it in Ubuntu with: apt-get install libghc-fastcgi-dev
-  else
-    Buildable: False
-
-  build-depends:   base >=4.2 && <5,
-                   time, time-compat, old-locale,
-                   directory,
-                   filepath,
-                   containers,
-                   process,
-                   gf >= 3.6,
-                   cgi >= 3001.1.7.3,
-                   httpd-shed>=0.4.0.2,
-                   mtl,
-                   exceptions,
-                   json >= 0.3.3,
-                   utf8-string >= 0.3.1.1,
-                   bytestring,
-                   pretty,
-                   random
-
-  if flag(network-uri)
-    build-depends: network-uri>=2.6, network>=2.6
-  else
-    build-depends: network>=2.3 && <2.6
-
-  ghc-options: -fwarn-unused-imports
-  if os(windows)
-    ghc-options: -optl-mwindows
-  else
-    build-depends: unix
-
-  if flag(c-runtime)
-    cpp-options: -DC_RUNTIME
-
-executable pgf-http
-  main-is: pgf-http.hs
-  Hs-source-dirs: exec
-  ghc-options: -threaded
-  if impl(ghc>=7.0)
-    ghc-options: -rtsopts
-
-  if flag(http)
-    buildable: True
-    build-depends: base >=4.2 && <5, gf-server, filepath, directory, cgi
-  else
-    buildable: False
-
-executable pgf-service
-  main-is: pgf-fcgi.hs
-  Hs-source-dirs: exec
-  ghc-options: -threaded -fwarn-unused-imports
-  if impl(ghc>=7.0)
-    ghc-options: -rtsopts
-
-  if flag(fastcgi)
-    build-depends: fastcgi >= 3001.0.2.2
-       -- Install it in Ubuntu with: apt-get install libghc-fastcgi-dev
-  else
-    Buildable: False
-
-  build-depends: base >=4.2 && <5, gf-server
-
-  if os(windows)
-    ghc-options: -optl-mwindows
-  else
-    build-depends: unix
-
-executable content-service
-  if flag(content)
-    build-depends: base >=4.2 && <5, old-locale,
-                   fastcgi >= 3001.0.2.2,
-                       -- In Ubuntu: apt-get install libghc-fastcgi-dev
-                   hsql-mysql, hsql
-                       -- In Ubuntu: apt-get install libghc-hsql-mysql-dev
-    buildable: True
-  else
-    buildable: False
-
-  main-is: ContentService.hs
-  Hs-source-dirs: exec
diff --git a/src/server/lighttpd.conf b/src/server/lighttpd.conf
index a495d705b..88a016513 100644
--- a/src/server/lighttpd.conf
+++ b/src/server/lighttpd.conf
@@ -1,4 +1,4 @@
-# Run with (with -D for no-daemon) 
+# Run with (with -D for no-daemon)
 # /usr/sbin/lighttpd -f lighttpd.conf -D
 #
 
@@ -10,8 +10,9 @@ server.modules              = (
                                 "mod_cgi"
                               )
 
-var.basedir = var.CWD 
+var.basedir = var.CWD
 
+# John: no longer valid after removing `src/ui` 2018-11-15
 server.document-root        = basedir + "/../ui/gwt/www"
 
 server.errorlog             = basedir + "/error.log"
@@ -96,4 +97,3 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
 ## bind to port (default: 80)
 server.port                = 41296
-