From 65b86d1f9c763b4a0cbb29b76d8f21035ef703af Mon Sep 17 00:00:00 2001 From: Paul Bonaud Date: Thu, 27 Dec 2018 11:47:42 +0100 Subject: app: rename `clever_entry_point`. It's only used by Haskell apps --- dhall/Config.dhall | 6 ++--- dhall/mkConfig.dhall | 76 ++++++++++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) (limited to 'dhall') 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 @@ - let Addon = ./addon/Addon.dhall +let Addon = ./addon/Addon.dhall in λ(Environment : Type) → { clever_app : @@ -15,7 +15,7 @@ in λ(Environment : Type) Text , clever_app_tasks_file : Text - , clever_entry_point : + , clever_haskell_entry_point : Text , clever_metrics : Bool @@ -23,4 +23,4 @@ in λ(Environment : Type) List Addon , clever_env : Environment - } + } \ 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 @@ - let Config = ./Config.dhall +let Config = ./Config.dhall in let Vault = ./Vault.dhall -in let Addon = ./addon/Addon.dhall + in let Addon = ./addon/Addon.dhall -in let Environment = ./environment/Environment.dhall + in let Environment = ./environment/Environment.dhall -in let nonifyEmpty = - λ(opt : Optional Text) - → Optional/fold Text opt Text (λ(x : Text) → x) "None" + in let nonifyEmpty = + λ(opt : Optional Text) + → Optional/fold Text opt Text (λ(x : Text) → x) "None" -in λ(vault : Vault) - → λ(app : Text) - → λ(entryPoint : Text) - → λ(metrics : Bool) - → λ(syslogServer : Optional Text) - → λ(domain : Optional Text) - → λ(tasksFile : Optional Text) - → λ(addons : List Addon) - → { clever_app = - app - , clever_orga = - vault.organization - , clever_secret = - vault.secret - , clever_token = - vault.token - , clever_syslog_server = - nonifyEmpty syslogServer - , clever_domain = - nonifyEmpty domain - , clever_app_tasks_file = - nonifyEmpty tasksFile - , clever_entry_point = - entryPoint - , clever_metrics = - metrics - , clever_addons = - addons - , clever_env = - { FORCE_HTTPS = True } - } - : Config Environment + in λ(vault : Vault) + → λ(app : Text) + → λ(entryPoint : Optional Text) + → λ(metrics : Bool) + → λ(syslogServer : Optional Text) + → λ(domain : Optional Text) + → λ(tasksFile : Optional Text) + → λ(addons : List Addon) + → { clever_app = + app + , clever_orga = + vault.organization + , clever_secret = + vault.secret + , clever_token = + vault.token + , clever_syslog_server = + nonifyEmpty syslogServer + , clever_domain = + nonifyEmpty domain + , clever_app_tasks_file = + nonifyEmpty tasksFile + , clever_haskell_entry_point = + nonifyEmpty entryPoint + , clever_metrics = + metrics + , clever_addons = + addons + , clever_env = + { FORCE_HTTPS = True } + } + : Config Environment \ No newline at end of file -- cgit v1.2.3