diff options
| author | Clement Delafargue <clement.delafargue@fretlink.com> | 2019-07-01 15:46:31 +0200 |
|---|---|---|
| committer | Clement Delafargue <clement.delafargue@fretlink.com> | 2019-07-01 15:46:31 +0200 |
| commit | a8c060229d00306720778c05fe5f53319a8de762 (patch) | |
| tree | 6e9aa7b68a6f83a56bfa0b321070be730db0fce6 | |
| parent | 4d19211ce62a7405e4992e54f83851d32f742837 (diff) | |
| download | ansible-clever-a8c060229d00306720778c05fe5f53319a8de762.tar.gz ansible-clever-a8c060229d00306720778c05fe5f53319a8de762.tar.zst ansible-clever-a8c060229d00306720778c05fe5f53319a8de762.zip | |
Remove default environment from Dhall config
| -rw-r--r-- | dhall/environment/Environment.dhall | 1 | ||||
| -rw-r--r-- | dhall/mkConfig.dhall | 84 | ||||
| -rw-r--r-- | dhall/types.dhall | 10 |
3 files changed, 42 insertions, 53 deletions
diff --git a/dhall/environment/Environment.dhall b/dhall/environment/Environment.dhall deleted file mode 100644 index 68514c9..0000000 --- a/dhall/environment/Environment.dhall +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | { FORCE_HTTPS : Bool } | ||
diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall index bd382de..37b029a 100644 --- a/dhall/mkConfig.dhall +++ b/dhall/mkConfig.dhall | |||
| @@ -1,45 +1,43 @@ | |||
| 1 | let Config = ./Config.dhall | 1 | let Config = ./Config.dhall |
| 2 | 2 | ||
| 3 | in let Vault = ./Vault.dhall | 3 | let Vault = ./Vault.dhall |
| 4 | 4 | ||
| 5 | in let Addon = ./addon/Addon.dhall | 5 | let Addon = ./addon/Addon.dhall |
| 6 | 6 | ||
| 7 | in let Environment = ./environment/Environment.dhall | 7 | let nonifyEmpty = |
| 8 | 8 | λ(opt : Optional Text) | |
| 9 | in let nonifyEmpty = | 9 | → Optional/fold Text opt Text (λ(x : Text) → x) "None" |
| 10 | λ(opt : Optional Text) | 10 | |
| 11 | → Optional/fold Text opt Text (λ(x : Text) → x) "None" | 11 | in λ(vault : Vault) |
| 12 | 12 | → λ(app : Text) | |
| 13 | in λ(vault : Vault) | 13 | → λ(organization : Text) |
| 14 | → λ(app : Text) | 14 | → λ(entryPoint : Optional Text) |
| 15 | → λ(organization : Text) | 15 | → λ(metrics : Bool) |
| 16 | → λ(entryPoint : Optional Text) | 16 | → λ(syslogServer : Optional Text) |
| 17 | → λ(metrics : Bool) | 17 | → λ(domain : Optional Text) |
| 18 | → λ(syslogServer : Optional Text) | 18 | → λ(tasksFile : Optional Text) |
| 19 | → λ(domain : Optional Text) | 19 | → λ(addons : List Addon) |
| 20 | → λ(tasksFile : Optional Text) | 20 | → { clever_app = |
| 21 | → λ(addons : List Addon) | 21 | app |
| 22 | → { clever_app = | 22 | , clever_orga = |
| 23 | app | 23 | organization |
| 24 | , clever_orga = | 24 | , clever_secret = |
| 25 | organization | 25 | vault.secret |
| 26 | , clever_secret = | 26 | , clever_token = |
| 27 | vault.secret | 27 | vault.token |
| 28 | , clever_token = | 28 | , clever_syslog_server = |
| 29 | vault.token | 29 | nonifyEmpty syslogServer |
| 30 | , clever_syslog_server = | 30 | , clever_domain = |
| 31 | nonifyEmpty syslogServer | 31 | nonifyEmpty domain |
| 32 | , clever_domain = | 32 | , clever_app_tasks_file = |
| 33 | nonifyEmpty domain | 33 | nonifyEmpty tasksFile |
| 34 | , clever_app_tasks_file = | 34 | , clever_haskell_entry_point = |
| 35 | nonifyEmpty tasksFile | 35 | nonifyEmpty entryPoint |
| 36 | , clever_haskell_entry_point = | 36 | , clever_metrics = |
| 37 | nonifyEmpty entryPoint | 37 | metrics |
| 38 | , clever_metrics = | 38 | , clever_addons = |
| 39 | metrics | 39 | addons |
| 40 | , clever_addons = | 40 | , clever_env = |
| 41 | addons | 41 | {=} |
| 42 | , clever_env = | 42 | } |
| 43 | { FORCE_HTTPS = True } | 43 | : Config {} |
| 44 | } | ||
| 45 | : Config Environment | ||
diff --git a/dhall/types.dhall b/dhall/types.dhall index 5e6a81c..ab153d2 100644 --- a/dhall/types.dhall +++ b/dhall/types.dhall | |||
| @@ -1,9 +1 @@ | |||
| 1 | { Vault = | { Vault = ./Vault.dhall, Addon = ./addon/Addon.dhall, Config = ./Config.dhall } | |
| 2 | ./Vault.dhall | ||
| 3 | , Addon = | ||
| 4 | ./addon/Addon.dhall | ||
| 5 | , Environment = | ||
| 6 | ./environment/Environment.dhall | ||
| 7 | , Config = | ||
| 8 | ./Config.dhall | ||
| 9 | } | ||