benjaoming
/
ansible
forked from data.coop/ansible
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing volume_folder vars

This commit is contained in:
Sam A. 2023-10-04 19:35:09 +02:00
parent f8b4e49f7f
commit 301d1b7719
Signed by untrusted user: samsapti
GPG Key ID: CBBBE7371E81C4EA
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/docker/defaults/main.yml
View File

@ -1,6 +1,7 @@
# vim: ft=yaml.ansible # vim: ft=yaml.ansible
--- ---
volume_root_folder: "/docker-volumes" volume_root_folder: "/docker-volumes"
volume_website_folder: "{{ volume_root_folder }}/websites"
services: services:
@ -114,6 +115,7 @@ services:
data_coop_website: data_coop_website:
domain: "{{ base_domain }}" domain: "{{ base_domain }}"
www_domain: "www.{{ base_domain }}" www_domain: "www.{{ base_domain }}"
volume_folder: "{{ volume_website_folder }}/datacoop"
pre_deploy_tasks: true pre_deploy_tasks: true
version: stable version: stable
staging_domain: "staging.{{ base_domain }}" staging_domain: "staging.{{ base_domain }}"
@ -121,20 +123,24 @@ services:
slides_2022_website: slides_2022_website:
domain: "2022.slides.{{ base_domain }}" domain: "2022.slides.{{ base_domain }}"
volume_folder: "{{ volume_website_folder }}/slides-2022"
version: latest version: latest
fedi_dk_website: fedi_dk_website:
domain: fedi.dk domain: fedi.dk
volume_folder: "{{ volume_website_folder }}/fedidk"
version: latest version: latest
vhs_website: vhs_website:
domain: vhs.data.coop domain: vhs.data.coop
volume_folder: "{{ volume_website_folder }}/vhs"
version: latest version: latest
cryptohagen_website: cryptohagen_website:
domains: domains:
- "cryptohagen.dk" - "cryptohagen.dk"
- "www.cryptohagen.dk" - "www.cryptohagen.dk"
volume_folder: "{{ volume_website_folder }}/cryptohagen"
ulovliglogning_website: ulovliglogning_website:
domains: domains:
@ -142,11 +148,13 @@ services:
- "www.ulovliglogning.dk" - "www.ulovliglogning.dk"
- "ulovlig-logning.dk" - "ulovlig-logning.dk"
- "www.ulovlig-logning.dk" - "www.ulovlig-logning.dk"
volume_folder: "{{ volume_website_folder }}/ulovliglogning"
cryptoaarhus_website: cryptoaarhus_website:
domains: domains:
- "cryptoaarhus.dk" - "cryptoaarhus.dk"
- "www.cryptoaarhus.dk" - "www.cryptoaarhus.dk"
volume_folder: "{{ volume_website_folder }}/cryptoaarhus"
drone: drone:
domain: "drone.{{ base_domain }}" domain: "drone.{{ base_domain }}"

4
roles/docker/templates/compose-files/data_coop_website.yml.j2
View File

@ -2,7 +2,7 @@
version: "3.8" version: "3.8"
services: services:
prod: prod-web:
image: docker.data.coop/data-coop-website:{{ services.data_coop_website.version }} image: docker.data.coop/data-coop-website:{{ services.data_coop_website.version }}
restart: unless-stopped restart: unless-stopped
networks: networks:
@ -12,7 +12,7 @@ services:
LETSENCRYPT_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}" LETSENCRYPT_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
staging: staging-web:
image: docker.data.coop/data-coop-website:{{ services.data_coop_website.staging_version }} image: docker.data.coop/data-coop-website:{{ services.data_coop_website.staging_version }}
restart: unless-stopped restart: unless-stopped
networks: networks: