commit 9367df8b6f96f9a9e250ada2188b98014b194307 parent 86d0071b29c34c56155728b84396e95686efe718 Author: Christian Grothoff <christian@grothoff.org> Date: Sat, 28 Dec 2024 21:27:27 +0100 -misc fixes Diffstat:
6 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/playbooks/setup.yml b/playbooks/setup.yml @@ -8,6 +8,7 @@ - database - libeufin-nexus - exchange + - challenger - auditor - monitoring # Note that we ONLY define those variables here that are NOT diff --git a/roles/auditor/tasks/main.yml b/roles/auditor/tasks/main.yml @@ -1,10 +1,13 @@ --- +- name: Get the list of services + service_facts: - name: Ensure taler-auditor service is stopped before upgrading - service: + systemd: name: taler-auditor.target state: stopped enabled: false + when: "'taler-auditor.target' in services" - name: Install Taler auditor package apt: diff --git a/roles/challenger/tasks/main.yml b/roles/challenger/tasks/main.yml @@ -23,7 +23,7 @@ enabled: false when: "'Postal Challenger backend' in services" -- name: Install Challenger package +- name: Install Challenger and Taler exchange packages apt: name: - challenger-httpd @@ -383,3 +383,9 @@ dest: /etc/nginx/sites-enabled/postal-challenger-nginx.conf state: link notify: restart nginx + +- name: Ensure taler-exchange service is is restarted with new configuration + service: + name: taler-exchange.target + state: restarted + enabled: true diff --git a/roles/exchange/tasks/main.yml b/roles/exchange/tasks/main.yml @@ -1,9 +1,13 @@ --- +- name: Get the list of services + service_facts: + - name: Ensure taler-exchange service is stopped before we upgrade - service: + systemd: name: taler-exchange.target state: stopped enabled: false + when: "'taler-exchange.target' in services" - name: Install latest Taler exchange package apt: diff --git a/roles/exchange/templates/etc/taler-exchange/conf.d/exchange-business.conf.j2 b/roles/exchange/templates/etc/taler-exchange/conf.d/exchange-business.conf.j2 @@ -41,6 +41,8 @@ ENABLE_DEBIT = YES # Make sure to URL-encode spaces in $NAME! PAYTO_URI = {{ EXCHANGE_BANK_ACCOUNT_PAYTO }} +WIRE_METHOD = iban + # Credentials to access the account are in a separate # config file with restricted permissions. @inline-secret@ exchange-accountcredentials-primary ../secrets/exchange-accountcredentials-primary.secret.conf diff --git a/roles/exchange/templates/etc/taler-exchange/secrets/exchange-accountcredentials-primary.secret.conf.j2 b/roles/exchange/templates/etc/taler-exchange/secrets/exchange-accountcredentials-primary.secret.conf.j2 @@ -1,9 +1,4 @@ [exchange-accountcredentials-primary] -PAYTO_URI = {{ EXCHANGE_BANK_ACCOUNT_PAYTO }} -WIRE_METHOD = iban -ENABLE_DEBIT = YES -ENABLE_CREDIT = YES - WIRE_GATEWAY_AUTH_METHOD = token WIRE_GATEWAY_URL = "http://localhost:{{ LIBEUFIN_PORT }}/taler-wire-gateway/" TOKEN = {{ ansible_facts['ansible_local']['libeufin-nexus-access-token']['libeufin-nexus']['auth_bearer_token'] }}