From 4d09c1ec11c7b789f2dca7ccb108ed8d4d024072 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Tue, 25 Jul 2023 22:17:35 +0200
Subject: [PATCH] Update ansible task for data.coop website with new branches
 and docker images

---
 roles/docker/defaults/main.yml                     |  8 +++-----
 roles/docker/tasks/services/websites/data.coop.yml | 14 +++++++++++++-
 .../tasks/services/websites/new.data.coop.yml      | 13 -------------
 3 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 roles/docker/tasks/services/websites/new.data.coop.yml

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 1f34ddb6..6dd7b1dd 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -129,11 +129,9 @@ services:
     domains:
       - "{{ base_domain }}"
       - "www.{{ base_domain }}"
-
-  new_data_coop_website:
-    file: websites/new.data.coop.yml
-    domain: "new.{{ base_domain }}"
-    version: hugo
+    version: stable
+    staging_domain: "staging.{{ base_domain }}"
+    staging_version: stable
 
   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 25028e11..e6898ad6 100644
--- a/roles/docker/tasks/services/websites/data.coop.yml
+++ b/roles/docker/tasks/services/websites/data.coop.yml
@@ -13,7 +13,7 @@
 - name: setup data.coop website docker container
   docker_container:
     name: data.coop_website
-    image: docker.data.coop/data-coop-website
+    image: docker.data.coop/data-coop-website:{{ services.data_coop_website.version }}
     restart_policy: unless-stopped
     networks:
       - name: external_services
@@ -21,3 +21,15 @@
       VIRTUAL_HOST : "{{ services.data_coop_website.domains|join(',') }}"
       LETSENCRYPT_HOST: "{{ services.data_coop_website.domains|join(',') }}"
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+
+- name: setup staging data.coop website using hugo
+  docker_container:
+    name: staging.data.coop_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 }}"
+      LETSENCRYPT_HOST: "{{ services.data_coop_website.staging_domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
diff --git a/roles/docker/tasks/services/websites/new.data.coop.yml b/roles/docker/tasks/services/websites/new.data.coop.yml
deleted file mode 100644
index 30836e1b..00000000
--- a/roles/docker/tasks/services/websites/new.data.coop.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# vim: ft=yaml.ansible
----
-- name: setup new data.coop website using hugo
-  docker_container:
-    name: new.data.coop_website
-    image: docker.data.coop/data-coop-website:{{ services.new_data_coop_website.version }}
-    restart_policy: unless-stopped
-    networks:
-      - name: external_services
-    env:
-      VIRTUAL_HOST : "{{ services.new_data_coop_website.domain }}"
-      LETSENCRYPT_HOST: "{{ services.new_data_coop_website.domain }}"
-      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"