From 9fca36b07f4cbb9b68ee88b7e26bb69eb9fb3f28 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 8 Dec 2017 14:05:05 +0100
Subject: [PATCH] Cleanup build & fix development default values

---
 .dockerignore                   |  1 +
 docker/Dockerfile => Dockerfile |  0
 config/settings.yml             |  6 +++---
 src/Settings.hs                 | 12 ++++++------
 stack.nix                       |  2 +-
 stack.yaml                      |  1 -
 6 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 .dockerignore
 rename docker/Dockerfile => Dockerfile (100%)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..01b7e33fd
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+**/*
\ No newline at end of file
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to Dockerfile
diff --git a/config/settings.yml b/config/settings.yml
index 4cf378423..a3dfcafe3 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -13,12 +13,12 @@ approot:        "_env:APPROOT:http://localhost:3000"
 # Optional values with the following production defaults.
 # In development, they default to the inverse.
 #
-detailed-logging: "_env:DETAILED_LOGGING:false"
-should-log-all: "_env:LOG_ALL:false"
+detailed-logging: "_env:DETAILED_LOGGING:invalid"
+should-log-all: "_env:LOG_ALL:invalid"
 # reload-templates: false
 # mutable-static: false
 # skip-combining: false
-auth-dummy-login: "_env:DUMMY_LOGIN:false"
+auth-dummy-login: "_env:DUMMY_LOGIN:invalid"
 
 # NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:PGPASS:'123'")
 # See https://github.com/yesodweb/yesod/wiki/Configuration#parsing-numeric-values-as-strings
diff --git a/src/Settings.hs b/src/Settings.hs
index e595cdc59..8d83b5f71 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -88,17 +88,17 @@ instance FromJSON AppSettings where
         ( appLDAPURI, appLDAPDN, appLDAPPw, appLDAPBaseName )
           <- (=<< o .: "ldap") . withObject "LDAP" $ \obj -> (,,,) <$> obj .: "uri" <*> obj .: "dn" <*> obj .: "password" <*> obj .:? "basename"
 
-        appDetailedRequestLogging <- o .:? "detailed-logging" .!= defaultDev
-        appShouldLogAll           <- o .:? "should-log-all"   .!= defaultDev
-        appReloadTemplates        <- o .:? "reload-templates" .!= defaultDev
-        appMutableStatic          <- o .:? "mutable-static"   .!= defaultDev
-        appSkipCombining          <- o .:? "skip-combining"   .!= defaultDev
+        appDetailedRequestLogging <- (o .:? "detailed-logging" <|> pure Nothing) .!= defaultDev
+        appShouldLogAll           <- (o .:? "should-log-all"   <|> pure Nothing) .!= defaultDev
+        appReloadTemplates        <- (o .:? "reload-templates" <|> pure Nothing) .!= defaultDev
+        appMutableStatic          <- (o .:? "mutable-static"   <|> pure Nothing) .!= defaultDev
+        appSkipCombining          <- (o .:? "skip-combining"   <|> pure Nothing) .!= defaultDev
 
         appCopyright              <- o .:  "copyright"
         appAnalytics              <- o .:? "analytics"
         appCryptoIDKeyFile        <- o .:  "cryptoid-keyfile"
 
-        appAuthDummyLogin         <- o .:? "auth-dummy-login"      .!= defaultDev
+        appAuthDummyLogin         <- (o .:? "auth-dummy-login" <|> pure Nothing) .!= defaultDev
 
         return AppSettings {..}
 
diff --git a/stack.nix b/stack.nix
index 56f39f845..6c8243ee9 100644
--- a/stack.nix
+++ b/stack.nix
@@ -6,6 +6,6 @@ in haskell.lib.buildStackProject {
   inherit ghc;
   name = "stackenv";
   buildInputs = with pkgs;
-    [ postgresql zlib
+    [ postgresql zlib openldap cyrus_sasl.dev
     ];
 }
diff --git a/stack.yaml b/stack.yaml
index 4de628c73..4ffa5300f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -3,7 +3,6 @@ docker:
   enable: false
   image: uniworx
 nix:
-  enable: false
   packages: []
   pure: false
   shell-file: ./stack.nix