From 414971157c8222fa11803cfc508db9b4b82c2474 Mon Sep 17 00:00:00 2001 From: sam32123 Date: Mon, 6 Jan 2025 12:40:41 +0100 Subject: [PATCH] added requested changes from Tobias and Silas --- ansible/group_vars/staging/vars.yml | 2 +- ansible/roles/koala/templates/.env.j2 | 6 +++--- ansible/roles/mongoose/templates/.env.j2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/group_vars/staging/vars.yml b/ansible/group_vars/staging/vars.yml index 5082aad5..7bfbb06f 100644 --- a/ansible/group_vars/staging/vars.yml +++ b/ansible/group_vars/staging/vars.yml @@ -50,7 +50,7 @@ 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 }}" secret_mollie_token_mongoose: "{{ vault_secret_mollie_token_mongoose }}" secret_pretix: diff --git a/ansible/roles/koala/templates/.env.j2 b/ansible/roles/koala/templates/.env.j2 index 3ea691b0..42b1fe60 100644 --- a/ansible/roles/koala/templates/.env.j2 +++ b/ansible/roles/koala/templates/.env.j2 @@ -17,9 +17,9 @@ SENTRY_DSN={{ secret_koala.sentry_dsn | default('') }} KOALA_DOMAIN=https://koala.{{ canonical_hostname }} # Mollie -MOLLIE_DOMAIN=https://api.mollie.nl -MOLLIE_TOKEN={{ secret_mollie_token }} -MOLLIE_VERSION=v1 +MOLLIE_DOMAIN=https://api.mollie.com +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 de33eacb..ac3ff6d3 100644 --- a/ansible/roles/mongoose/templates/.env.j2 +++ b/ansible/roles/mongoose/templates/.env.j2 @@ -9,9 +9,9 @@ DB_PORT= API_TOKEN={{ vault_secret_mongoose.api_key }} # MOLLIE credentials for the iDEAL integration. -MOLLIE_DOMAIN=https://api.mollie.nl +MOLLIE_DOMAIN=https://api.mollie.com MOLLIE_API_TOKEN={{ secret_mollie_token_mongoose }} -MOLLIE_VERSION=v1 +MOLLIE_VERSION=v2 # Settings for django DJANGO_KEY={{ vault_secret_mongoose.django_key }}