commit 821d025d87ca6f618326f3955b538309caec1ffb parent 8f5121873865699f85d2ada73574b94985f3de0e Author: Florian Dold <dold@taler.net> Date: Fri, 31 Jul 2026 15:43:31 +0200 minor config tweaks / cleanup Diffstat:
10 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/playbooks/setup.yml b/playbooks/setup.yml @@ -22,7 +22,6 @@ postexchange: false - role: exchange - role: challenger - name: challenger postexchange: true when: deploy_challenger | bool - role: auditor diff --git a/roles/challenger/tasks/pre-exchange.yml b/roles/challenger/tasks/pre-exchange.yml @@ -302,7 +302,7 @@ - postal-challenger-nginx.conf - postal-challenger-http.conf -- name: Secure the auditor site with Letsencrypt +- name: Secure the challenger sites with Letsencrypt ansible.builtin.include_role: name: cert vars: diff --git a/roles/devtesting/tasks/main.yml b/roles/devtesting/tasks/main.yml @@ -13,7 +13,7 @@ group: name: devtesting -- name: Ensure technical user for libeufin-nexus import exists +- name: Ensure technical user for devtesting exists user: name: devtesting group: devtesting diff --git a/roles/exchange/handlers/main.yml b/roles/exchange/handlers/main.yml @@ -7,5 +7,3 @@ chdir: /tmp become: true become_user: taler-exchange-sanctionscheck - environment: - ANSIBLE_REMOTE_TMP: /tmp/ansible diff --git a/roles/exchange/tasks/main.yml b/roles/exchange/tasks/main.yml @@ -62,7 +62,7 @@ - name: Download Typst release archive ansible.builtin.get_url: - url: "https://github.com/typst/typst/releases/download/v{{ typst_version }}/typst-x86_64-unknown-linux-musl.tar.xz" + url: "{{ typst_download_url }}" dest: "{{ temp_dir.path }}/typst.tar.xz" checksum: "{{ typst_checksum }}" mode: '0644' @@ -137,7 +137,7 @@ state: link notify: Restart nginx -- name: Ensure /etc/taler-exchange/config.d/ directory exists +- name: Check that /etc/taler-exchange/conf.d/ directory exists ansible.builtin.stat: path: "/etc/taler-exchange/conf.d/" register: st diff --git a/roles/libeufin-nexus/tasks/main.yml b/roles/libeufin-nexus/tasks/main.yml @@ -126,9 +126,6 @@ cmd: libeufin-dbconfig --only-nexus chdir: /tmp -- name: Show vars - ansible.builtin.setup: - - name: Check if EBICS client keys exist. stat: path: /var/lib/libeufin-nexus/client-ebics-keys.json @@ -158,7 +155,7 @@ msg: External EBICS bank keys missing when: ebics_keys_external and not stat_result.stat.exists -- name: Adjust EBICS client keys permissions +- name: Adjust EBICS bank keys permissions file: path: "/var/lib/libeufin-nexus/bank-ebics-keys.json" state: file @@ -271,7 +268,7 @@ mode: "0755" when: not use_ebics -- name: Allow technical users access to import acocunt. +- name: Allow technical users access to import account. ansible.builtin.copy: src: home/libeufin-nexus-import/.ssh/authorized_keys dest: "/home/libeufin-nexus-import/.ssh/authorized_keys" @@ -280,7 +277,7 @@ mode: "0644" when: not use_ebics -- name: Allow technical users access to export acocunt. +- name: Allow technical users access to export account. ansible.builtin.copy: src: home/libeufin-nexus-export/.ssh/authorized_keys dest: "/home/libeufin-nexus-export/.ssh/authorized_keys" diff --git a/roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus-ebics.conf.j2 b/roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus-ebics.conf.j2 @@ -12,5 +12,5 @@ USER_ID = {{ LIBEUFIN_NEXUS_EBICS_USER_ID }} # EBICS partner ID, as assigned by the bank. PARTNER_ID = {{ LIBEUFIN_NEXUS_EBICS_PARTNER_ID }} -# EBICS partner ID, as assigned by the bank. # ??? -SYSTEM_ID = {{ LIBEUFIN_NEXUS_EBICS_SYSTEM_ID }} -\ No newline at end of file +# EBICS system ID, as assigned by the bank. +SYSTEM_ID = {{ LIBEUFIN_NEXUS_EBICS_SYSTEM_ID }} diff --git a/roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus.conf.j2 b/roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus.conf.j2 @@ -45,9 +45,6 @@ SERVE = tcp PORT = {{ LIBEUFIN_PORT }} BIND_TO = 127.0.0.1 -[nexus-postgres] -CONFIG = postgres:///libeufin - {% if exchange_qr_iban is defined and exchange_qr_iban %} [nexus-ebics] QR_IBAN = {{ exchange_qr_iban }} diff --git a/roles/libeufin-nexus/templates/etc/libeufin/wire-gateway.secret.conf.j2 b/roles/libeufin-nexus/templates/etc/libeufin/wire-gateway.secret.conf.j2 @@ -1,2 +1,2 @@ [nexus-httpd-wire-gateway-api] -TOKEN = {{ ansible_local['libeufin-nexus-access-token'] }} -\ No newline at end of file +TOKEN = {{ ansible_local['libeufin-nexus-access-token'] }} diff --git a/roles/libeufin-nexus/templates/etc/nginx/sites-available/nexus-nginx.conf.j2 b/roles/libeufin-nexus/templates/etc/nginx/sites-available/nexus-nginx.conf.j2 @@ -30,6 +30,6 @@ server { # Other nexus APIs might be allowed # in the future. location /taler-prepared-transfer/ { - proxy_pass http://localhost:8082/taler-prepared-transfer/; + proxy_pass http://localhost:{{ LIBEUFIN_PORT }}/taler-prepared-transfer/; } }