From ee76fb194ae636ec60c1b7544e2a009186c66429 Mon Sep 17 00:00:00 2001 From: SamStaijen <15876627+SamStaijen@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:17:30 +0100 Subject: [PATCH] added mollie secrets for mongoose (#492) * added mollie secrets for mongoose * added requested changes from Tobias and Silas * Updated .env file for radio and renamed koala mollie token variable * fixed forgotten mollie var rename in staging * changed mollie.com to mollie.nl in koala env --------- Co-authored-by: Job Vonk --- ansible/group_vars/production/vars.yml | 3 ++- ansible/group_vars/staging/vars.yml | 3 ++- ansible/roles/koala/templates/.env.j2 | 4 ++-- ansible/roles/mongoose/templates/.env.j2 | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ansible/group_vars/production/vars.yml b/ansible/group_vars/production/vars.yml index aade10c0..2b487539 100644 --- a/ansible/group_vars/production/vars.yml +++ b/ansible/group_vars/production/vars.yml @@ -58,7 +58,8 @@ secret_backup_aws: secret_key: "{{ vault_secret_backup_aws.secret_key }}" # To change, regenerate the token in Mollie's web interface. -secret_mollie_token: "{{ vault_secret_mollie_token }}" +secret_mollie_token_koala: "{{ vault_secret_mollie_token_koala }}" +secret_mollie_token_mongoose: "{{ vault_secret_mollie_token_mongoose }}" secret_pretix: # To change, generate a new password and set it in the Mailgun interface: diff --git a/ansible/group_vars/staging/vars.yml b/ansible/group_vars/staging/vars.yml index 7be7abf9..39c50e4c 100644 --- a/ansible/group_vars/staging/vars.yml +++ b/ansible/group_vars/staging/vars.yml @@ -50,7 +50,8 @@ secret_backup_aws: secret_key: "{{ vault_secret_backup_aws.secret_key }}" # To change, regenerate the token in Mollie's web interface. -secret_mollie_token: "{{ vault_secret_mollie_token }}" +secret_mollie_token_koala: "{{ vault_secret_mollie_token_koala }}" +secret_mollie_token_mongoose: "{{ vault_secret_mollie_token_mongoose }}" secret_pretix: # To change, generate a new password and set it in the Mailgun interface: diff --git a/ansible/roles/koala/templates/.env.j2 b/ansible/roles/koala/templates/.env.j2 index 3ea691b0..651536e0 100644 --- a/ansible/roles/koala/templates/.env.j2 +++ b/ansible/roles/koala/templates/.env.j2 @@ -18,8 +18,8 @@ KOALA_DOMAIN=https://koala.{{ canonical_hostname }} # Mollie MOLLIE_DOMAIN=https://api.mollie.nl -MOLLIE_TOKEN={{ secret_mollie_token }} -MOLLIE_VERSION=v1 +MOLLIE_TOKEN={{ secret_mollie_token_koala }} +MOLLIE_VERSION=v2 # Other RAILS_ENV={{ koala_env.environment }} diff --git a/ansible/roles/mongoose/templates/.env.j2 b/ansible/roles/mongoose/templates/.env.j2 index 578bb7d8..74b37727 100644 --- a/ansible/roles/mongoose/templates/.env.j2 +++ b/ansible/roles/mongoose/templates/.env.j2 @@ -33,4 +33,4 @@ OIDC_OP_TOKEN_ENDPOINT=https://koala.{{ canonical_hostname }}/api/oauth/token OIDC_OP_USER_ENDPOINT=https://koala.{{ canonical_hostname }}/oauth/userinfo OIDC_OP_JWKS_ENDPOINT=https://koala.{{ canonical_hostname }}/oauth/discovery/keys -MOLLIE_API_KEY={{ secret_mollie_token }} +MOLLIE_API_KEY={{ secret_mollie_token_mongoose }}