From 6d3450d9ae31d67aaa68f4c3cb952becf4d6b890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Tue, 9 Feb 2021 21:01:38 +0100 Subject: [PATCH 1/4] Use copy instead of template for static files --- roles/docker/tasks/services/matrix_riot.yml | 28 ++++++++++----------- roles/docker/tasks/services/privatebin.yml | 4 +-- roles/docker/tasks/services/thelounge.yml | 4 +-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 016cc6e..f3eb819 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -27,38 +27,38 @@ loop_var: volume - name: upload riot config.json - template: - src: files/configs/riot/config.json + copy: + src: configs/riot/config.json dest: "{{ riot.volume_folder }}/data/config.json" - name: upload riot.im.conf - template: - src: files/configs/riot/riot.im.conf + copy: + src: configs/riot/riot.im.conf dest: "{{ riot.volume_folder }}/data/riot.im.conf" - name: upload vhost config for root domain - template: - src: files/configs/matrix/vhost-root + copy: + src: configs/matrix/vhost-root dest: "{{ nginx.volume_folder }}/vhost/{{ base_domain }}" - name: upload vhost config for matrix domain - template: - src: files/configs/matrix/vhost-matrix + copy: + src: configs/matrix/vhost-matrix dest: "{{ nginx.volume_folder }}/vhost/{{ matrix.domain }}" - name: upload vhost config for riot domain - template: - src: files/configs/matrix/vhost-riot + copy: + src: configs/matrix/vhost-riot dest: "{{ nginx.volume_folder }}/vhost/{{ riot.domains[0] }}" - name: upload homeserver.yaml - template: - src: "files/configs/matrix/homeserver.yaml" + copy: + src: "configs/matrix/homeserver.yaml" dest: "{{ matrix.volume_folder }}/data/homeserver.yaml" - name: upload matrix logging config - template: - src: "files/configs/matrix/matrix.data.coop.log.config" + copy: + src: "configs/matrix/matrix.data.coop.log.config" dest: "{{ matrix.volume_folder }}/data/matrix.data.coop.log.config" - name: set up matrix and riot diff --git a/roles/docker/tasks/services/privatebin.yml b/roles/docker/tasks/services/privatebin.yml index 3d0f7ad..65e690f 100644 --- a/roles/docker/tasks/services/privatebin.yml +++ b/roles/docker/tasks/services/privatebin.yml @@ -11,8 +11,8 @@ loop_var: volume - name: upload privatebin config - template: - src: files/configs/privatebin-conf.php + copy: + src: configs/privatebin-conf.php dest: "{{ privatebin.volume_folder }}/cfg/conf.php" - name: privatebin app container diff --git a/roles/docker/tasks/services/thelounge.yml b/roles/docker/tasks/services/thelounge.yml index 1e269fd..3efc8b4 100644 --- a/roles/docker/tasks/services/thelounge.yml +++ b/roles/docker/tasks/services/thelounge.yml @@ -5,8 +5,8 @@ name: thelounge - name: upload thelounge config - template: - src: files/configs/thelounge.js + copy: + src: configs/thelounge.js dest: /var/lib/docker/volumes/thelounge/_data/config.js - name: thelounge container -- 2.43.4 From 3f0c16362a00603391106f63b9186fc244a8d338 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Tue, 6 Dec 2022 19:04:37 +0100 Subject: [PATCH 2/4] Move Jinja2 templates to templates directory --- roles/docker/tasks/services/mastodon.yml | 8 ++++---- roles/docker/tasks/services/matrix_riot.yml | 8 ++++---- roles/docker/tasks/services/nextcloud.yml | 4 ++-- roles/docker/tasks/services/rallly.yml | 2 +- .../mastodon/env_file.j2 => templates/mastodon.env.j2} | 0 .../matrix.homeserver.yaml.j2} | 0 .../rallly/env_file.j2 => templates/rallly.env.j2} | 0 .../riot/config.json => templates/riot.config.json.j2} | 0 8 files changed, 11 insertions(+), 11 deletions(-) rename roles/docker/{files/configs/mastodon/env_file.j2 => templates/mastodon.env.j2} (100%) rename roles/docker/{files/configs/matrix/homeserver.yaml.j2 => templates/matrix.homeserver.yaml.j2} (100%) rename roles/docker/{files/configs/rallly/env_file.j2 => templates/rallly.env.j2} (100%) rename roles/docker/{files/configs/riot/config.json => templates/riot.config.json.j2} (100%) diff --git a/roles/docker/tasks/services/mastodon.yml b/roles/docker/tasks/services/mastodon.yml index eae1546..905ee0a 100644 --- a/roles/docker/tasks/services/mastodon.yml +++ b/roles/docker/tasks/services/mastodon.yml @@ -14,17 +14,17 @@ - name: Copy mastodon environment file template: - src: files/configs/mastodon/env_file.j2 + src: mastodon.env.j2 dest: "{{ services.mastodon.volume_folder }}/env_file" - name: Upload vhost config for root domain - template: - src: files/configs/mastodon/vhost-mastodon + copy: + src: configs/mastodon/vhost-mastodon dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}" - name: Copy PostgreSQL config copy: - src: files/configs/mastodon/postgresql.conf + src: configs/mastodon/postgresql.conf dest: "{{ services.mastodon.volume_folder }}/postgres_config/postgresql.conf" - name: Set up Mastodon diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 4bb9077..b7f952f 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -27,8 +27,8 @@ loop_var: volume - name: upload riot config.json - copy: - src: configs/riot/config.json + template: + src: riot.config.json.j2 dest: "{{ services.riot.volume_folder }}/data/config.json" - name: upload riot.im.conf @@ -54,12 +54,12 @@ - name: upload homeserver.yaml template: - src: "files/configs/matrix/homeserver.yaml.j2" + src: matrix.homeserver.yaml.j2 dest: "{{ services.matrix.volume_folder }}/data/homeserver.yaml" - name: upload matrix logging config copy: - src: "configs/matrix/matrix.data.coop.log.config" + src: configs/matrix/matrix.data.coop.log.config dest: "{{ services.matrix.volume_folder }}/data/matrix.data.coop.log.config" - name: set up matrix and riot diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml index d36f8de..edfe3fe 100644 --- a/roles/docker/tasks/services/nextcloud.yml +++ b/roles/docker/tasks/services/nextcloud.yml @@ -1,7 +1,7 @@ --- - name: upload vhost config for cloud.data.coop - template: - src: files/configs/nextcloud/vhost + copy: + src: configs/nextcloud/vhost dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}" notify: "restart nginx" diff --git a/roles/docker/tasks/services/rallly.yml b/roles/docker/tasks/services/rallly.yml index b5e9d2f..e26f276 100644 --- a/roles/docker/tasks/services/rallly.yml +++ b/roles/docker/tasks/services/rallly.yml @@ -5,7 +5,7 @@ - name: Copy Rallly environment file template: - src: files/configs/rallly/env_file.j2 + src: rallly.env.j2 dest: "{{ services.rallly.volume_folder }}/env_file" - name: Set up Rallly diff --git a/roles/docker/files/configs/mastodon/env_file.j2 b/roles/docker/templates/mastodon.env.j2 similarity index 100% rename from roles/docker/files/configs/mastodon/env_file.j2 rename to roles/docker/templates/mastodon.env.j2 diff --git a/roles/docker/files/configs/matrix/homeserver.yaml.j2 b/roles/docker/templates/matrix.homeserver.yaml.j2 similarity index 100% rename from roles/docker/files/configs/matrix/homeserver.yaml.j2 rename to roles/docker/templates/matrix.homeserver.yaml.j2 diff --git a/roles/docker/files/configs/rallly/env_file.j2 b/roles/docker/templates/rallly.env.j2 similarity index 100% rename from roles/docker/files/configs/rallly/env_file.j2 rename to roles/docker/templates/rallly.env.j2 diff --git a/roles/docker/files/configs/riot/config.json b/roles/docker/templates/riot.config.json.j2 similarity index 100% rename from roles/docker/files/configs/riot/config.json rename to roles/docker/templates/riot.config.json.j2 -- 2.43.4 From 6c529bed31b79cdc26bafebf1ac83d9d0da11e62 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Tue, 6 Dec 2022 19:25:04 +0100 Subject: [PATCH 3/4] Streamline folder structure --- .../configs/{privatebin-conf.php => privatebin/conf.php} | 0 .../configs/{mastodon/vhost-mastodon => vhost/mastodon} | 0 .../files/configs/{matrix/vhost-matrix => vhost/matrix} | 0 .../files/configs/{nextcloud/vhost => vhost/nextcloud} | 0 .../docker/files/configs/{matrix/vhost-riot => vhost/riot} | 0 .../docker/files/configs/{matrix/vhost-root => vhost/root} | 0 roles/docker/tasks/services/mastodon.yml | 2 +- roles/docker/tasks/services/matrix_riot.yml | 6 +++--- roles/docker/tasks/services/nextcloud.yml | 2 +- roles/docker/tasks/services/privatebin.yml | 2 +- 10 files changed, 6 insertions(+), 6 deletions(-) rename roles/docker/files/configs/{privatebin-conf.php => privatebin/conf.php} (100%) rename roles/docker/files/configs/{mastodon/vhost-mastodon => vhost/mastodon} (100%) rename roles/docker/files/configs/{matrix/vhost-matrix => vhost/matrix} (100%) rename roles/docker/files/configs/{nextcloud/vhost => vhost/nextcloud} (100%) rename roles/docker/files/configs/{matrix/vhost-riot => vhost/riot} (100%) rename roles/docker/files/configs/{matrix/vhost-root => vhost/root} (100%) diff --git a/roles/docker/files/configs/privatebin-conf.php b/roles/docker/files/configs/privatebin/conf.php similarity index 100% rename from roles/docker/files/configs/privatebin-conf.php rename to roles/docker/files/configs/privatebin/conf.php diff --git a/roles/docker/files/configs/mastodon/vhost-mastodon b/roles/docker/files/configs/vhost/mastodon similarity index 100% rename from roles/docker/files/configs/mastodon/vhost-mastodon rename to roles/docker/files/configs/vhost/mastodon diff --git a/roles/docker/files/configs/matrix/vhost-matrix b/roles/docker/files/configs/vhost/matrix similarity index 100% rename from roles/docker/files/configs/matrix/vhost-matrix rename to roles/docker/files/configs/vhost/matrix diff --git a/roles/docker/files/configs/nextcloud/vhost b/roles/docker/files/configs/vhost/nextcloud similarity index 100% rename from roles/docker/files/configs/nextcloud/vhost rename to roles/docker/files/configs/vhost/nextcloud diff --git a/roles/docker/files/configs/matrix/vhost-riot b/roles/docker/files/configs/vhost/riot similarity index 100% rename from roles/docker/files/configs/matrix/vhost-riot rename to roles/docker/files/configs/vhost/riot diff --git a/roles/docker/files/configs/matrix/vhost-root b/roles/docker/files/configs/vhost/root similarity index 100% rename from roles/docker/files/configs/matrix/vhost-root rename to roles/docker/files/configs/vhost/root diff --git a/roles/docker/tasks/services/mastodon.yml b/roles/docker/tasks/services/mastodon.yml index 905ee0a..c448250 100644 --- a/roles/docker/tasks/services/mastodon.yml +++ b/roles/docker/tasks/services/mastodon.yml @@ -19,7 +19,7 @@ - name: Upload vhost config for root domain copy: - src: configs/mastodon/vhost-mastodon + src: configs/vhost/mastodon dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}" - name: Copy PostgreSQL config diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index b7f952f..261fdea 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -38,17 +38,17 @@ - name: upload vhost config for root domain copy: - src: configs/matrix/vhost-root + src: configs/vhost/root dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}" - name: upload vhost config for matrix domain copy: - src: configs/matrix/vhost-matrix + src: configs/vhost/matrix dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}" - name: upload vhost config for riot domains copy: - src: configs/matrix/vhost-riot + src: configs/vhost/riot dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ item }}" loop: "{{ services.riot.domains }}" diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml index edfe3fe..8bfb246 100644 --- a/roles/docker/tasks/services/nextcloud.yml +++ b/roles/docker/tasks/services/nextcloud.yml @@ -1,7 +1,7 @@ --- - name: upload vhost config for cloud.data.coop copy: - src: configs/nextcloud/vhost + src: configs/vhost/nextcloud dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}" notify: "restart nginx" diff --git a/roles/docker/tasks/services/privatebin.yml b/roles/docker/tasks/services/privatebin.yml index 0e2a9ea..0213a40 100644 --- a/roles/docker/tasks/services/privatebin.yml +++ b/roles/docker/tasks/services/privatebin.yml @@ -12,7 +12,7 @@ - name: upload privatebin config copy: - src: configs/privatebin-conf.php + src: configs/privatebin/conf.php dest: "{{ services.privatebin.volume_folder }}/cfg/conf.php" - name: privatebin app container -- 2.43.4 From fbdcbd5d23eb8b573e372f3f8ca9fb796c6d82c2 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Tue, 6 Dec 2022 19:39:30 +0100 Subject: [PATCH 4/4] Specify loop var for Element domains --- roles/docker/tasks/services/matrix_riot.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 261fdea..68b984f 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -49,8 +49,10 @@ - name: upload vhost config for riot domains copy: src: configs/vhost/riot - dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ item }}" + dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ domain }}" loop: "{{ services.riot.domains }}" + loop_control: + loop_var: domain - name: upload homeserver.yaml template: -- 2.43.4