aboutsummaryrefslogtreecommitdiffhomepage
path: root/dhall/mkConfig.dhall
diff options
context:
space:
mode:
authorClement Delafargue <clement.delafargue@fretlink.com>2019-07-01 14:55:17 +0200
committerClement Delafargue <clement.delafargue@fretlink.com>2019-07-01 14:55:52 +0200
commit4d19211ce62a7405e4992e54f83851d32f742837 (patch)
tree3ea6d8408460adc83e951f5f7e6d1528a89226cb /dhall/mkConfig.dhall
parentc6f248b4041ad25593862e1a3b7c58be17c0a094 (diff)
downloadansible-clever-4d19211ce62a7405e4992e54f83851d32f742837.tar.gz
ansible-clever-4d19211ce62a7405e4992e54f83851d32f742837.tar.zst
ansible-clever-4d19211ce62a7405e4992e54f83851d32f742837.zip
remove org_id from vault type, add sshKey in vault
Diffstat (limited to 'dhall/mkConfig.dhall')
-rw-r--r--dhall/mkConfig.dhall13
1 files changed, 7 insertions, 6 deletions
diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall
index cf64bef..bd382de 100644
--- a/dhall/mkConfig.dhall
+++ b/dhall/mkConfig.dhall
@@ -1,17 +1,18 @@
1let Config = ./Config.dhall 1let Config = ./Config.dhall
2 2
3in let Vault = ./Vault.dhall 3in let Vault = ./Vault.dhall
4 4
5 in let Addon = ./addon/Addon.dhall 5 in let Addon = ./addon/Addon.dhall
6 6
7 in let Environment = ./environment/Environment.dhall 7 in let Environment = ./environment/Environment.dhall
8 8
9 in let nonifyEmpty = 9 in let nonifyEmpty =
10 λ(opt : Optional Text) 10 λ(opt : Optional Text)
11 → Optional/fold Text opt Text (λ(x : Text) → x) "None" 11 → Optional/fold Text opt Text (λ(x : Text) → x) "None"
12 12
13 in λ(vault : Vault) 13 in λ(vault : Vault)
14 → λ(app : Text) 14 → λ(app : Text)
15 → λ(organization : Text)
15 → λ(entryPoint : Optional Text) 16 → λ(entryPoint : Optional Text)
16 → λ(metrics : Bool) 17 → λ(metrics : Bool)
17 → λ(syslogServer : Optional Text) 18 → λ(syslogServer : Optional Text)
@@ -21,7 +22,7 @@ in let Vault = ./Vault.dhall
21 → { clever_app = 22 → { clever_app =
22 app 23 app
23 , clever_orga = 24 , clever_orga =
24 vault.organization 25 organization
25 , clever_secret = 26 , clever_secret =
26 vault.secret 27 vault.secret
27 , clever_token = 28 , clever_token =
@@ -41,4 +42,4 @@ in let Vault = ./Vault.dhall
41 , clever_env = 42 , clever_env =
42 { FORCE_HTTPS = True } 43 { FORCE_HTTPS = True }
43 } 44 }
44 : Config Environment \ No newline at end of file 45 : Config Environment