From 78cd1306b22fa5766a50c7d9ae38fcb4fe427aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Sat, 6 Jan 2024 13:46:26 +0100 Subject: [PATCH 1/2] Add phanpy service --- roles/docker/defaults/main.yml | 5 +++++ .../compose-files/phanpy_website.yml.j2 | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 roles/docker/templates/compose-files/phanpy_website.yml.j2 diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index f838c09..d9621f1 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -158,6 +158,11 @@ services: - "www.cryptoaarhus.dk" volume_folder: "{{ volume_website_folder }}/cryptoaarhus" + phanpy_website: + domain: "phanpy.data.coop" + volume_folder: "{{ volume_website_folder }}/phanpy" + version: latest + drone: domain: "drone.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/drone" diff --git a/roles/docker/templates/compose-files/phanpy_website.yml.j2 b/roles/docker/templates/compose-files/phanpy_website.yml.j2 new file mode 100644 index 0000000..52a2b4c --- /dev/null +++ b/roles/docker/templates/compose-files/phanpy_website.yml.j2 @@ -0,0 +1,22 @@ +# vim: ft=yaml.docker-compose +version: "3.8" + +services: + web: + image: docker.data.coop/unipi:{{ services.phanpy_website.version }} + restart: unless-stopped + networks: + - external_services + environment: + VIRTUAL_HOST: "{{ services.phanpy_website.domain }}" + LETSENCRYPT_HOST: "{{ services.phanpy_website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + command: --remote=https://git.data.coop/reynir/phanpy.git#production + cap_add: + - NET_ADMIN + devices: + - "/dev/net/tun" + +networks: + external_services: + external: true -- 2.40.1 From 65527be1f03408ba0a323c54cad282ad793704a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Tue, 2 Apr 2024 10:12:14 +0200 Subject: [PATCH 2/2] phanpy: Use base_domain --- roles/docker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index d9621f1..70d3ee2 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -159,7 +159,7 @@ services: volume_folder: "{{ volume_website_folder }}/cryptoaarhus" phanpy_website: - domain: "phanpy.data.coop" + domain: "phanpy.{{ base_domain }}" volume_folder: "{{ volume_website_folder }}/phanpy" version: latest -- 2.40.1