From 8c97012a8a9dd5afc7fbc7c586108dd3779e0e68 Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Wed, 14 Sep 2022 21:55:03 +0200 Subject: [PATCH] :hammer: pottwal: Use variable for xmpp domain name --- pottwal.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pottwal.yml b/pottwal.yml index f12f09e..f78ef9f 100644 --- a/pottwal.yml +++ b/pottwal.yml @@ -13,6 +13,7 @@ shlink_domain_name: sl.n39.eu prosody_data: "{{ data_dir }}/prosody" + prosody_domain_name: jabber.n39.eu jabber_host_port: 8086 hedgedoc_host_port: 8084 @@ -33,7 +34,7 @@ - name: uritools-api.n39.eu - name: sl.n39.eu - name: pad.n39.eu - - name: jabber.n39.eu + - name: "{{ prosody_domain_name }}" deploy_cert_hook: "docker exec prosody prosodyctl --root cert import ${DOMAIN} /var/lib/dehydrated/certs" - role: penguineer.dehydrated_cron - role: dd24-dyndns-cron @@ -140,7 +141,7 @@ - "{{ prosody_data }}/etc/prosody:/etc/prosody:rw" - "{{ prosody_data }}/var/lib/prosody:/var/lib/prosody:rw" - "{{ prosody_data }}/var/log/prosody:/var/log/prosody:rw" - - "{{ dehydrated_certs_dir }}/jabber.n39.eu:/var/lib/dehydrated/certs/jabber.n39.eu:ro" + - "{{ dehydrated_certs_dir }}/{{ prosody_domain_name }}:/var/lib/dehydrated/certs/{{ prosody_domain_name }}:ro" - name: Ensure container for static XMPP website is running docker_container: @@ -159,12 +160,12 @@ volumes: - "{{ prosody_data }}/var/www:/public:ro" - - name: Setup proxy site jabber.n39.eu + - name: Setup proxy site {{ prosody_domain_name }} # point to static website for now include_role: name: setup-http-site-proxy vars: - site_name: "jabber.n39.eu" + site_name: "{{ prosody_domain_name }}" proxy_port: "{{ jabber_host_port }}" - name: Check if hedgedoc data dir exists