From ee8a6f0598fb6040ca7884eb3386d255ed4552af Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 8 Oct 2021 10:03:27 +0200 Subject: [PATCH] Rename domain group variable to server_domain --- group_vars/testing.yml | 2 ++ roles/whoami/tasks/main.yml | 4 ++-- roles/whoami/templates/upstream.json.j2 | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/group_vars/testing.yml b/group_vars/testing.yml index 29d0841..f300b8b 100644 --- a/group_vars/testing.yml +++ b/group_vars/testing.yml @@ -8,3 +8,5 @@ caddy_tls_use_staging: yes whoami_use_https: no wallabag_use_https: no + +#server_domain: mytest.com diff --git a/roles/whoami/tasks/main.yml b/roles/whoami/tasks/main.yml index fbed190..f423e8e 100644 --- a/roles/whoami/tasks/main.yml +++ b/roles/whoami/tasks/main.yml @@ -8,7 +8,7 @@ register: result changed_when: (result.stdout | from_json) != (lookup('template', 'upstream.json.j2') | from_yaml) become: yes - notify: "update upstream" + notify: "update whoami upstream" - name: Deploy whoami to swarm community.general.docker_stack: @@ -21,5 +21,5 @@ become: yes tags: - docker-swarm - notify: "update upstream" + notify: "update whoami upstream" diff --git a/roles/whoami/templates/upstream.json.j2 b/roles/whoami/templates/upstream.json.j2 index 024897f..ccc60e4 100644 --- a/roles/whoami/templates/upstream.json.j2 +++ b/roles/whoami/templates/upstream.json.j2 @@ -1,6 +1,6 @@ { "@id": "{{ stack.name }}_upstream", -{% if domain is not undefined and not none %} +{% if server_domain is not undefined and not none %} "match": [ { "host": [