From c00ab53269f6e6ab878dd8040f0738361730df72 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Thu, 1 Aug 2024 13:46:21 +0200 Subject: [PATCH 1/2] Update environment variables re: https://git.data.coop/data.coop/membersystem/issues/38 --- group_vars/all/secrets.yml.contents | 4 +++- roles/docker/defaults/main.yml | 2 +- roles/docker/templates/compose-files/membersystem.yml.j2 | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/group_vars/all/secrets.yml.contents b/group_vars/all/secrets.yml.contents index 7ba62f6c..37527306 100644 --- a/group_vars/all/secrets.yml.contents +++ b/group_vars/all/secrets.yml.contents @@ -55,6 +55,8 @@ rallly_secrets: membersystem_secrets: secret_key: xxx + stripe_api_key: xxx + stripe_endpoint_secret: xxx diun: - matrix_password: xxx \ No newline at end of file + matrix_password: xxx diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index bc6232da..cb4cf8c5 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -193,7 +193,7 @@ services: membersystem: domain: "member.{{ base_domain }}" - django_admins: "Vidir:valberg@orn.li" + django_admins: "Vidir:valberg@orn.li Balder:benjaoming@data.coop" volume_folder: "{{ volume_root_folder }}/membersystem" version: latest postgres_version: 13-alpine diff --git a/roles/docker/templates/compose-files/membersystem.yml.j2 b/roles/docker/templates/compose-files/membersystem.yml.j2 index fae37672..795080af 100644 --- a/roles/docker/templates/compose-files/membersystem.yml.j2 +++ b/roles/docker/templates/compose-files/membersystem.yml.j2 @@ -26,6 +26,8 @@ services: CSRF_TRUSTED_ORIGINS: https://{{ services.membersystem.domain }} DJANGO_ADMINS: "{{ services.membersystem.django_admins }}" DEFAULT_FROM_EMAIL: noreply@{{ services.membersystem.domain }} + STRIPE_API_KEY: "{{ membersystem_secrets.stripe_api_key }}" + STRIPE_ENDPOINT_SECRET: "{{ membersystem_secrets.stripe_endpoint_secret }}" depends_on: - postgres From 5ff603393b7849d535a7992d7dab631763660d8a Mon Sep 17 00:00:00 2001 From: valberg Date: Fri, 2 Aug 2024 22:52:37 +0000 Subject: [PATCH 2/2] Update roles/docker/defaults/main.yml --- 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 cb4cf8c5..a9bdf9d7 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -193,7 +193,7 @@ services: membersystem: domain: "member.{{ base_domain }}" - django_admins: "Vidir:valberg@orn.li Balder:benjaoming@data.coop" + django_admins: "Vidir:valberg@orn.li,Balder:benjaoming@data.coop" volume_folder: "{{ volume_root_folder }}/membersystem" version: latest postgres_version: 13-alpine