From 1157a45f9ca2f579b11462865271379d175127fc Mon Sep 17 00:00:00 2001 From: Paul Bonaud Date: Fri, 28 Sep 2018 11:14:12 +0200 Subject: domain: allow the domain to be specified via clever_domain variable Every other variables are prefixed with `clever_` which makes the definition of variables clearer from a "app" configuration point of view. WDYT? --- README.md | 3 ++- tasks/deploy.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e6d607c..5c3b999 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,8 @@ Variables for the application - `clever_addons`: a list of dict describing addons enabled for the application from which we would use information during deploy, optional.
Example: `{ name: pg, env_prefix: POSTGRESQL_ADDON }` - `clever_app_tasks_file`: tasks file to be executed after environment and addons variables where gathered. Specific to an app, should be use to run migrations. Optional. -- `domain`: the domain from which the application should be reachable, optional +- `clever_domain`: the domain from which the application should be reachable, optional. +- _Obsolete_: `domain`: Same as above but was replaced by `clever_domain` since v1.4 of this role. - `syslog_server`: UDP Syslog server to be used as UDPSyslog drain for the application, optional. Example: `udp://198.51.100.51:12345`. - `clever_metrics`: a boolean to enable or disable metrics support. Optional, default to `false`. diff --git a/tasks/deploy.yml b/tasks/deploy.yml index 4b3f48b..205eb2b 100644 --- a/tasks/deploy.yml +++ b/tasks/deploy.yml @@ -6,10 +6,10 @@ CONFIGURATION_FILE: "{{ clever_login_file }}" - name: Configure Domain - when: domain is defined + when: domain is defined or clever_domain is defined command: clever-set-domain.sh environment: - DOMAIN: "{{ domain }}" + DOMAIN: "{{ clever_domain | default(domain) }}" CONFIGURATION_FILE: "{{ clever_login_file }}" - name: Push Environment -- cgit v1.2.3