From 085bb1dfe75a4d6cd6d7815ce194e8bfcc8d284e Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Wed, 26 Jul 2023 17:03:33 +0200
Subject: [PATCH] Avoid code duplication

---
 roles/docker/defaults/main.yml                     |  7 +++----
 roles/docker/tasks/services/websites/data.coop.yml | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 6dd7b1d..343d6cc 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -126,12 +126,11 @@ services:
 
   data_coop_website:
     file: websites/data.coop.yml
-    domains:
-      - "{{ base_domain }}"
-      - "www.{{ base_domain }}"
+    domain: "{{ base_domain }}"
+    www_domain: "www.{{ base_domain }}"
     version: stable
     staging_domain: "staging.{{ base_domain }}"
-    staging_version: stable
+    staging_version: staging
 
   slides_2022_website:
     file: websites/2022.slides.data.coop.yml
diff --git a/roles/docker/tasks/services/websites/data.coop.yml b/roles/docker/tasks/services/websites/data.coop.yml
index e6898ad..2806177 100644
--- a/roles/docker/tasks/services/websites/data.coop.yml
+++ b/roles/docker/tasks/services/websites/data.coop.yml
@@ -3,33 +3,33 @@
 - name: Upload vhost config for root domain
   copy:
     src: files/configs/matrix/vhost-root
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}"
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.domain }}"
 
 - name: Upload vhost config for WWW domain
   copy:
     src: files/configs/vhost-www
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/www.{{ base_domain }}"
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.www_domain }}"
 
 - name: setup data.coop website docker container
   docker_container:
-    name: data.coop_website
+    name: "{{ services.data_coop_website.domain }}_website"
     image: docker.data.coop/data-coop-website:{{ services.data_coop_website.version }}
     restart_policy: unless-stopped
     networks:
       - name: external_services
     env:
-      VIRTUAL_HOST : "{{ services.data_coop_website.domains|join(',') }}"
-      LETSENCRYPT_HOST: "{{ services.data_coop_website.domains|join(',') }}"
+      VIRTUAL_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 }}"
 
 - name: setup staging data.coop website using hugo
   docker_container:
-    name: staging.data.coop_website
+    name: "{{ services.data_coop_website.staging_domain }}_website"
     image: docker.data.coop/data-coop-website:{{ services.data_coop_website.staging_version }}
     restart_policy: unless-stopped
     networks:
       - name: external_services
     env:
-      VIRTUAL_HOST : "{{ services.data_coop_website.staging_domain }}"
+      VIRTUAL_HOST: "{{ services.data_coop_website.staging_domain }}"
       LETSENCRYPT_HOST: "{{ services.data_coop_website.staging_domain }}"
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"