remove org_id from vault type, add sshKey in vault

diff --git a/dhall/Vault.dhall b/dhall/Vault.dhall
index ba1a30913b9747414740818aa2ebde75939e237d..b2a45cc3aa3f3e729d9b24738c41884acd718e59 100644 (file)
--- a/dhall/Vault.dhall
+++ b/dhall/Vault.dhall
@@ -1 +1 @@
-{ organization : Text, secret : Text, token : Text }
+{ token : Text, secret : Text, sshKey : Text }

diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall
index cf64befea3a5ec7aeaeb270be353883561f91775..bd382de9fd2261c2da89210e7956e543a712c52c 100644 (file)
--- a/dhall/mkConfig.dhall
+++ b/dhall/mkConfig.dhall
@@ -1,17 +1,18 @@
 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)
@@ -21,7 +22,7 @@ in  let Vault = ./Vault.dhall
                     →   { clever_app =
                             app
                         , clever_orga =
-                            vault.organization
+                            organization
                         , clever_secret =
                             vault.secret
                         , clever_token =
@@ -41,4 +42,4 @@ in  let Vault = ./Vault.dhall
                         , clever_env =
                             { FORCE_HTTPS = True }
                         }
-                      : Config Environment
\ No newline at end of file
+                      : Config Environment