From 9c86bbb7fe74cceb43cbff0d58658b44fea63db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Mon, 5 Dec 2022 10:45:51 +0100 Subject: [PATCH 1/6] Add pinafore --- roles/docker/defaults/main.yml | 5 +++++ roles/docker/tasks/services/pinafore.yml | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 roles/docker/tasks/services/pinafore.yml diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index b3ad3ce..64751e1 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -164,6 +164,11 @@ services: version: a21f92bf74308d66cfcd545d49b81eba0211a222 allowed_sender_domain: true + pinafore: + file: pinafore.yml + domain: "pinafore.{{ base_domain }}" + version: 2.4.0 + membersystem: file: membersystem.yml domain: "member.{{ base_domain }}" diff --git a/roles/docker/tasks/services/pinafore.yml b/roles/docker/tasks/services/pinafore.yml new file mode 100644 index 0000000..9f61956 --- /dev/null +++ b/roles/docker/tasks/services/pinafore.yml @@ -0,0 +1,11 @@ +- name: Set up Pinafore + docker_container: + name: pinafore + image: "docker.data.coop/pinafore:{{ services.pinafore.version }}" + restart_policy: unless-stopped + networks: + - name: external_services + VIRTUAL_HOST: "{{ services.pinafore.domain }}" + VIRTUAL_PORT: 4002 + labels: + com.centurylinklabs.watchtower.enable: "true" -- 2.43.4 From 3c76cdab6c980f9849f093f6fb346d648c5cfabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Mon, 5 Dec 2022 10:53:51 +0100 Subject: [PATCH 2/6] Fixup environment oops --- roles/docker/tasks/services/pinafore.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/services/pinafore.yml b/roles/docker/tasks/services/pinafore.yml index 9f61956..563c92b 100644 --- a/roles/docker/tasks/services/pinafore.yml +++ b/roles/docker/tasks/services/pinafore.yml @@ -5,7 +5,8 @@ restart_policy: unless-stopped networks: - name: external_services - VIRTUAL_HOST: "{{ services.pinafore.domain }}" - VIRTUAL_PORT: 4002 + environment: + VIRTUAL_HOST: "{{ services.pinafore.domain }}" + VIRTUAL_PORT: 4002 labels: com.centurylinklabs.watchtower.enable: "true" -- 2.43.4 From 27b2b692ebe20d00b89003ea08d4194102fc5434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Mon, 5 Dec 2022 10:54:53 +0100 Subject: [PATCH 3/6] ok it was 'env' for docker_container... --- roles/docker/tasks/services/pinafore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/pinafore.yml b/roles/docker/tasks/services/pinafore.yml index 563c92b..db27cdf 100644 --- a/roles/docker/tasks/services/pinafore.yml +++ b/roles/docker/tasks/services/pinafore.yml @@ -5,7 +5,7 @@ restart_policy: unless-stopped networks: - name: external_services - environment: + env: VIRTUAL_HOST: "{{ services.pinafore.domain }}" VIRTUAL_PORT: 4002 labels: -- 2.43.4 From 270019027d02436656c7c35fa9eb01b3d46507ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Mon, 5 Dec 2022 10:55:36 +0100 Subject: [PATCH 4/6] Wrap port env in quotes --- roles/docker/tasks/services/pinafore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/pinafore.yml b/roles/docker/tasks/services/pinafore.yml index db27cdf..e81b872 100644 --- a/roles/docker/tasks/services/pinafore.yml +++ b/roles/docker/tasks/services/pinafore.yml @@ -7,6 +7,6 @@ - name: external_services env: VIRTUAL_HOST: "{{ services.pinafore.domain }}" - VIRTUAL_PORT: 4002 + VIRTUAL_PORT: "4002" labels: com.centurylinklabs.watchtower.enable: "true" -- 2.43.4 From b22ebd9d3f941989f6203c43f047c979d2259b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Mon, 5 Dec 2022 10:56:34 +0100 Subject: [PATCH 5/6] Pinafore version is prefixed with a 'v' --- 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 64751e1..f5a54e7 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -167,7 +167,7 @@ services: pinafore: file: pinafore.yml domain: "pinafore.{{ base_domain }}" - version: 2.4.0 + version: v2.4.0 membersystem: file: membersystem.yml -- 2.43.4 From 92cd6c4716a9658ece7d80492caf06a0d4742c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Mon, 5 Dec 2022 10:58:57 +0100 Subject: [PATCH 6/6] Add letsencrypt vars --- roles/docker/tasks/services/pinafore.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/docker/tasks/services/pinafore.yml b/roles/docker/tasks/services/pinafore.yml index e81b872..a275f3a 100644 --- a/roles/docker/tasks/services/pinafore.yml +++ b/roles/docker/tasks/services/pinafore.yml @@ -8,5 +8,7 @@ env: VIRTUAL_HOST: "{{ services.pinafore.domain }}" VIRTUAL_PORT: "4002" + LETSENCRYPT_HOST: "{{ services.pinafore.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" labels: com.centurylinklabs.watchtower.enable: "true" -- 2.43.4