aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpaulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com>2018-10-04 16:09:57 +0200
committerGitHub <noreply@github.com>2018-10-04 16:09:57 +0200
commit36858ff42eae09bd653d7fec8b770c93d91a06ab (patch)
tree5915cbef95da5da530bff767dbe5c4191cb9a646
parentec83672c5e269ba349f74829406aeed87ecd414b (diff)
parent23c0fc8abaca221b2773f1c2677cbcee471a03df (diff)
downloadansible-clever-36858ff42eae09bd653d7fec8b770c93d91a06ab.tar.gz
ansible-clever-36858ff42eae09bd653d7fec8b770c93d91a06ab.tar.zst
ansible-clever-36858ff42eae09bd653d7fec8b770c93d91a06ab.zip
Merge pull request #14 from paulrbr-fl/rename-syslog-server-varv1.5
vars: add a clever_syslog_server variable replacing syslog_server
-rw-r--r--README.md3
-rw-r--r--tasks/deploy.yml4
2 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index 5c3b999..ff31653 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,8 @@ Variables for the application
28- `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. 28- `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.
29- `clever_domain`: the domain from which the application should be reachable, optional. 29- `clever_domain`: the domain from which the application should be reachable, optional.
30- _Obsolete_: `domain`: Same as above but was replaced by `clever_domain` since v1.4 of this role. 30- _Obsolete_: `domain`: Same as above but was replaced by `clever_domain` since v1.4 of this role.
31- `syslog_server`: UDP Syslog server to be used as UDPSyslog drain for the application, optional. Example: `udp://198.51.100.51:12345`. 31- `clever_syslog_server`: UDP Syslog server to be used as UDPSyslog drain for the application, optional. Example: `udp://198.51.100.51:12345`.
32- _Obsolete_: `syslog_server`: Same as above but was replaced by `clever_syslog_server` since v1.5 of this role.
32- `clever_metrics`: a boolean to enable or disable metrics support. Optional, default to `false`. 33- `clever_metrics`: a boolean to enable or disable metrics support. Optional, default to `false`.
33 34
34Variables specific to deployment, default should be fine: 35Variables specific to deployment, default should be fine:
diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index 205eb2b..400a79d 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -1,8 +1,8 @@
1- name: Configure Drain 1- name: Configure Drain
2 when: syslog_server is defined 2 when: syslog_server is defined or clever_syslog_server is defined
3 command: clever-set-drain.sh 3 command: clever-set-drain.sh
4 environment: 4 environment:
5 SYSLOG_UDP_SERVER: "{{ syslog_server }}" 5 SYSLOG_UDP_SERVER: "{{ clever_syslog_server | default(syslog_server) }}"
6 CONFIGURATION_FILE: "{{ clever_login_file }}" 6 CONFIGURATION_FILE: "{{ clever_login_file }}"
7 7
8- name: Configure Domain 8- name: Configure Domain