diff options
| author | paulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com> | 2018-12-27 15:28:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-27 15:28:57 +0100 |
| commit | e5697403dacf206a7fe99c2efa9fe03297785446 (patch) | |
| tree | b44454d0108182c3a489672edafd0c211cbaf103 /dhall | |
| parent | 62408b8cdb2d984c2e73a94bae4fef96b28d9c41 (diff) | |
| parent | 65b86d1f9c763b4a0cbb29b76d8f21035ef703af (diff) | |
| download | ansible-clever-e5697403dacf206a7fe99c2efa9fe03297785446.tar.gz ansible-clever-e5697403dacf206a7fe99c2efa9fe03297785446.tar.zst ansible-clever-e5697403dacf206a7fe99c2efa9fe03297785446.zip | |
Merge pull request #30 from paulrbr-fl/rename-entry-point
app: rename `clever_entry_point`. It's only used by Haskell apps
Diffstat (limited to 'dhall')
| -rw-r--r-- | dhall/Config.dhall | 6 | ||||
| -rw-r--r-- | dhall/mkConfig.dhall | 76 |
2 files changed, 41 insertions, 41 deletions
diff --git a/dhall/Config.dhall b/dhall/Config.dhall index 01329a8..db063b7 100644 --- a/dhall/Config.dhall +++ b/dhall/Config.dhall | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | let Addon = ./addon/Addon.dhall | 1 | let Addon = ./addon/Addon.dhall |
| 2 | 2 | ||
| 3 | in λ(Environment : Type) | 3 | in λ(Environment : Type) |
| 4 | → { clever_app : | 4 | → { clever_app : |
| @@ -15,7 +15,7 @@ in λ(Environment : Type) | |||
| 15 | Text | 15 | Text |
| 16 | , clever_app_tasks_file : | 16 | , clever_app_tasks_file : |
| 17 | Text | 17 | Text |
| 18 | , clever_entry_point : | 18 | , clever_haskell_entry_point : |
| 19 | Text | 19 | Text |
| 20 | , clever_metrics : | 20 | , clever_metrics : |
| 21 | Bool | 21 | Bool |
| @@ -23,4 +23,4 @@ in λ(Environment : Type) | |||
| 23 | List Addon | 23 | List Addon |
| 24 | , clever_env : | 24 | , clever_env : |
| 25 | Environment | 25 | Environment |
| 26 | } | 26 | } \ No newline at end of file |
diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall index 5040f1c..cf64bef 100644 --- a/dhall/mkConfig.dhall +++ b/dhall/mkConfig.dhall | |||
| @@ -1,44 +1,44 @@ | |||
| 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 | → λ(entryPoint : Text) | 15 | → λ(entryPoint : Optional Text) |
| 16 | → λ(metrics : Bool) | 16 | → λ(metrics : Bool) |
| 17 | → λ(syslogServer : Optional Text) | 17 | → λ(syslogServer : Optional Text) |
| 18 | → λ(domain : Optional Text) | 18 | → λ(domain : Optional Text) |
| 19 | → λ(tasksFile : Optional Text) | 19 | → λ(tasksFile : Optional Text) |
| 20 | → λ(addons : List Addon) | 20 | → λ(addons : List Addon) |
| 21 | → { clever_app = | 21 | → { clever_app = |
| 22 | app | 22 | app |
| 23 | , clever_orga = | 23 | , clever_orga = |
| 24 | vault.organization | 24 | vault.organization |
| 25 | , clever_secret = | 25 | , clever_secret = |
| 26 | vault.secret | 26 | vault.secret |
| 27 | , clever_token = | 27 | , clever_token = |
| 28 | vault.token | 28 | vault.token |
| 29 | , clever_syslog_server = | 29 | , clever_syslog_server = |
| 30 | nonifyEmpty syslogServer | 30 | nonifyEmpty syslogServer |
| 31 | , clever_domain = | 31 | , clever_domain = |
| 32 | nonifyEmpty domain | 32 | nonifyEmpty domain |
| 33 | , clever_app_tasks_file = | 33 | , clever_app_tasks_file = |
| 34 | nonifyEmpty tasksFile | 34 | nonifyEmpty tasksFile |
| 35 | , clever_entry_point = | 35 | , clever_haskell_entry_point = |
| 36 | entryPoint | 36 | nonifyEmpty entryPoint |
| 37 | , clever_metrics = | 37 | , clever_metrics = |
| 38 | metrics | 38 | metrics |
| 39 | , clever_addons = | 39 | , clever_addons = |
| 40 | addons | 40 | addons |
| 41 | , clever_env = | 41 | , clever_env = |
| 42 | { FORCE_HTTPS = True } | 42 | { FORCE_HTTPS = True } |
| 43 | } | 43 | } |
| 44 | : Config Environment | 44 | : Config Environment \ No newline at end of file |