Remove default environment from Dhall config

diff --git a/dhall/environment/Environment.dhall b/dhall/environment/Environment.dhall
deleted file mode 100644 (file)
index 68514c9..0000000
--- a/dhall/environment/Environment.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{ FORCE_HTTPS : Bool }

diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall
index bd382de9fd2261c2da89210e7956e543a712c52c..37b029a8e2a03744514236475c75be1563b4c47b 100644 (file)
--- a/dhall/mkConfig.dhall
+++ b/dhall/mkConfig.dhall
@@ -1,45 +1,43 @@
 let Config = ./Config.dhall
 
-in  let Vault = ./Vault.dhall
-    
-    in  let Addon = ./addon/Addon.dhall
-        
-        in  let Environment = ./environment/Environment.dhall
-            
-            in  let nonifyEmpty =
-                        λ(opt : Optional Text)
-                      → Optional/fold Text opt Text (λ(x : Text) → x) "None"
-                
-                in    λ(vault : Vault)
-                    → λ(app : Text)
-                    → λ(organization : Text)
-                    → λ(entryPoint : Optional Text)
-                    → λ(metrics : Bool)
-                    → λ(syslogServer : Optional Text)
-                    → λ(domain : Optional Text)
-                    → λ(tasksFile : Optional Text)
-                    → λ(addons : List Addon)
-                    →   { clever_app =
-                            app
-                        , clever_orga =
-                            organization
-                        , clever_secret =
-                            vault.secret
-                        , clever_token =
-                            vault.token
-                        , clever_syslog_server =
-                            nonifyEmpty syslogServer
-                        , clever_domain =
-                            nonifyEmpty domain
-                        , clever_app_tasks_file =
-                            nonifyEmpty tasksFile
-                        , clever_haskell_entry_point =
-                            nonifyEmpty entryPoint
-                        , clever_metrics =
-                            metrics
-                        , clever_addons =
-                            addons
-                        , clever_env =
-                            { FORCE_HTTPS = True }
-                        }
-                      : Config Environment
+let Vault = ./Vault.dhall
+
+let Addon = ./addon/Addon.dhall
+
+let nonifyEmpty =
+        λ(opt : Optional Text)
+      → Optional/fold Text opt Text (λ(x : Text) → x) "None"
+
+in    λ(vault : Vault)
+    → λ(app : Text)
+    → λ(organization : Text)
+    → λ(entryPoint : Optional Text)
+    → λ(metrics : Bool)
+    → λ(syslogServer : Optional Text)
+    → λ(domain : Optional Text)
+    → λ(tasksFile : Optional Text)
+    → λ(addons : List Addon)
+    →   { clever_app =
+            app
+        , clever_orga =
+            organization
+        , clever_secret =
+            vault.secret
+        , clever_token =
+            vault.token
+        , clever_syslog_server =
+            nonifyEmpty syslogServer
+        , clever_domain =
+            nonifyEmpty domain
+        , clever_app_tasks_file =
+            nonifyEmpty tasksFile
+        , clever_haskell_entry_point =
+            nonifyEmpty entryPoint
+        , clever_metrics =
+            metrics
+        , clever_addons =
+            addons
+        , clever_env =
+            {=}
+        }
+      : Config {}

diff --git a/dhall/types.dhall b/dhall/types.dhall
index 5e6a81cc981c4b57a238dd344c23e6aa6d213aee..ab153d2e7096512fc4fbe815c85ee6ac9388d0c1 100644 (file)
--- a/dhall/types.dhall
+++ b/dhall/types.dhall
@@ -1,9 +1 @@
-{ Vault =
-    ./Vault.dhall
-, Addon =
-    ./addon/Addon.dhall
-, Environment =
-    ./environment/Environment.dhall
-, Config =
-    ./Config.dhall
-}
+{ Vault = ./Vault.dhall, Addon = ./addon/Addon.dhall, Config = ./Config.dhall }