From 447b82326cf2372262b2f4321078b20064f83e27 Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Mon, 13 Jan 2020 17:29:09 +0100
Subject: [PATCH 1/2] Add ulovliglogning.dk website to the stack

---
 playbook.yml                                      |  1 +
 roles/docker/defaults/main.yml                    |  4 ++++
 roles/docker/tasks/services/ulovliglogning-dk.yml | 13 +++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 roles/docker/tasks/services/ulovliglogning-dk.yml

diff --git a/playbook.yml b/playbook.yml
index a4030411..582056a4 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -23,6 +23,7 @@
       - docker_registry
       - drone
       - websites
+      - ulovliglogning-dk
       - ouroboros
       - mailu
       - portainer
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index c6aa7181..25fb3d7a 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -54,6 +54,9 @@ data_coop_website:
 cryptohagen_website:
   domain: "cryptohagen.dk"
 
+ulovliglogning_website:
+  domain: "ulovliglogning.dk"
+
 drone:
   domain: "drone.{{ base_domain }}"
   volume_folder: "{{ volume_root_folder }}/drone"
@@ -72,3 +75,4 @@ portainer:
 ttrss:
   domain: rss.{{ base_domain }}
   volume_folder: "{{ volume_root_folder }}/tt-rss"
+
diff --git a/roles/docker/tasks/services/ulovliglogning-dk.yml b/roles/docker/tasks/services/ulovliglogning-dk.yml
new file mode 100644
index 00000000..9a6eaff3
--- /dev/null
+++ b/roles/docker/tasks/services/ulovliglogning-dk.yml
@@ -0,0 +1,13 @@
+- name: setup ulovliglogning.dk website docker container
+  docker_container:
+    name: ulovliglogning_website
+    restart_policy: unless-stopped
+    image: ulovliglogning/ulovliglogning.dk:latest
+    networks:
+      - name: external_services
+    env:
+      VIRTUAL_HOST : "{{ ulovliglogning_website.domain }}"
+      LETSENCRYPT_HOST: "{{ ulovliglogning_website.domain }}"
+      LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
+    labels:
+      com.ouroboros.enable: "true"  
\ No newline at end of file

From ef3e0993dad8639b0edbba38df3a808c66ac66d5 Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Tue, 14 Jan 2020 07:58:32 +0100
Subject: [PATCH 2/2] Add www.[domain] to hosted websites

---
 roles/docker/defaults/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 25fb3d7a..eec0cbcb 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -49,13 +49,13 @@ docker_registry:
   password: "{{ docker_password }}"
 
 data_coop_website:
-  domain: "{{ base_domain }}"
+  domain: "{{ base_domain }},www.{{ base_domain }}"
 
 cryptohagen_website:
-  domain: "cryptohagen.dk"
+  domain: "cryptohagen.dk,www.cryptohagen.dk"
 
 ulovliglogning_website:
-  domain: "ulovliglogning.dk"
+  domain: "ulovliglogning.dk,www.ulovliglogning.dk"
 
 drone:
   domain: "drone.{{ base_domain }}"