From 4cf48f13c064d10b52870e56d95da90b8935b72b Mon Sep 17 00:00:00 2001 From: Vidir Valberg Gudmundsson Date: Fri, 29 May 2020 23:36:07 +0200 Subject: [PATCH] Add new data.coop website. Fix postfix container for newest ansible. Comment out tt-rss. --- playbook.yml | 2 +- roles/docker/tasks/services/postfix.yml | 4 ++-- roles/docker/tasks/services/websites.yml | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/playbook.yml b/playbook.yml index 582056a4..f92730e3 100644 --- a/playbook.yml +++ b/playbook.yml @@ -27,7 +27,7 @@ - ouroboros - mailu - portainer - - tt-rss +# - tt-rss smtp_host: "postfix" smtp_port: "587" diff --git a/roles/docker/tasks/services/postfix.yml b/roles/docker/tasks/services/postfix.yml index ee0896dc..3ab9d3cd 100644 --- a/roles/docker/tasks/services/postfix.yml +++ b/roles/docker/tasks/services/postfix.yml @@ -4,8 +4,8 @@ docker_network: name: postfix ipam_config: - subnet: '172.16.0.0/16' - gateway: 172.16.0.1 + - subnet: '172.16.0.0/16' + gateway: 172.16.0.1 - name: setup postfix docker container for outgoing mail docker_container: diff --git a/roles/docker/tasks/services/websites.yml b/roles/docker/tasks/services/websites.yml index 2436da2c..fee9aa82 100644 --- a/roles/docker/tasks/services/websites.yml +++ b/roles/docker/tasks/services/websites.yml @@ -12,7 +12,21 @@ LETSENCRYPT_HOST: "{{ data_coop_website.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: - com.ouroboros.enable: "true" + com.ouroboros.enable: "true" + +- name: setup new data.coop website using hugo + docker_container: + name: data.coop_website + image: docker.data.coop/data-coop-website:hugo + restart_policy: unless-stopped + networks: + - name: external_services + env: + VIRTUAL_HOST : "new.{{ data_coop_website.domain }}" + LETSENCRYPT_HOST: "new.{{ data_coop_website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + labels: + com.ouroboros.enable: "true" - name: setup cryptohagen.dk website docker container docker_container: