diff options
-rw-r--r-- | dhall/Vault.dhall | 2 | ||||
-rw-r--r-- | dhall/mkConfig.dhall | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/dhall/Vault.dhall b/dhall/Vault.dhall index ba1a309..b2a45cc 100644 --- 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 cf64bef..bd382de 100644 --- a/dhall/mkConfig.dhall +++ b/dhall/mkConfig.dhall | |||
@@ -1,17 +1,18 @@ | |||
1 | let Config = ./Config.dhall | 1 | let Config = ./Config.dhall |
2 | 2 | ||
3 | in let Vault = ./Vault.dhall | 3 | in 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 |