From 301d1b77190f760ed0f61c0d9f76d914869a30a1 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Wed, 4 Oct 2023 19:35:09 +0200 Subject: [PATCH] Add missing volume_folder vars --- roles/docker/defaults/main.yml | 8 ++++++++ .../templates/compose-files/data_coop_website.yml.j2 | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 118d8dcc..6e539e83 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1,6 +1,7 @@ # vim: ft=yaml.ansible --- volume_root_folder: "/docker-volumes" +volume_website_folder: "{{ volume_root_folder }}/websites" services: @@ -114,6 +115,7 @@ services: data_coop_website: domain: "{{ base_domain }}" www_domain: "www.{{ base_domain }}" + volume_folder: "{{ volume_website_folder }}/datacoop" pre_deploy_tasks: true version: stable staging_domain: "staging.{{ base_domain }}" @@ -121,20 +123,24 @@ services: slides_2022_website: domain: "2022.slides.{{ base_domain }}" + volume_folder: "{{ volume_website_folder }}/slides-2022" version: latest fedi_dk_website: domain: fedi.dk + volume_folder: "{{ volume_website_folder }}/fedidk" version: latest vhs_website: domain: vhs.data.coop + volume_folder: "{{ volume_website_folder }}/vhs" version: latest cryptohagen_website: domains: - "cryptohagen.dk" - "www.cryptohagen.dk" + volume_folder: "{{ volume_website_folder }}/cryptohagen" ulovliglogning_website: domains: @@ -142,11 +148,13 @@ services: - "www.ulovliglogning.dk" - "ulovlig-logning.dk" - "www.ulovlig-logning.dk" + volume_folder: "{{ volume_website_folder }}/ulovliglogning" cryptoaarhus_website: domains: - "cryptoaarhus.dk" - "www.cryptoaarhus.dk" + volume_folder: "{{ volume_website_folder }}/cryptoaarhus" drone: domain: "drone.{{ base_domain }}" diff --git a/roles/docker/templates/compose-files/data_coop_website.yml.j2 b/roles/docker/templates/compose-files/data_coop_website.yml.j2 index 6910ca3b..909cbecc 100644 --- a/roles/docker/templates/compose-files/data_coop_website.yml.j2 +++ b/roles/docker/templates/compose-files/data_coop_website.yml.j2 @@ -2,7 +2,7 @@ version: "3.8" services: - prod: + prod-web: image: docker.data.coop/data-coop-website:{{ services.data_coop_website.version }} restart: unless-stopped networks: @@ -12,7 +12,7 @@ services: LETSENCRYPT_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - staging: + staging-web: image: docker.data.coop/data-coop-website:{{ services.data_coop_website.staging_version }} restart: unless-stopped networks: