[taler-ansible-taler-exchange] branch master updated: must combine challenger tasks

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository ansible-taler-exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 6f5f1f1  must combine challenger tasks
6f5f1f1 is described below

commit 6f5f1f15a0171aafee5a78223cba5d9f8c5c9a61
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Nov 23 22:56:32 2024 +0100

    must combine challenger tasks
---
 .../systemd/system/sms-challenger-httpd.service    |  0
 .../{sms-challenger => challenger}/tasks/main.yml  | 26 ++++++++++++++++++++++
 .../etc/challenger/email-challenger.conf.j2}       |  0
 .../etc/challenger/postal-challenger.conf.j2}      |  0
 .../etc/challenger/sms-challenger.conf.j2          |  0
 .../templates/etc/challenger/sms-challenger.env    |  0
 .../email-challenger-nginx.conf.j2}                |  0
 .../sites-available}/postal-challenger-nginx.conf  |  0
 .../sites-available/sms-challenger-nginx.conf.j2   |  0
 .../taler-exchange/config.d/sms-challenger.conf.j2 |  0
 roles/email-challenger/tasks/main.yml              | 26 ----------------------
 ...hange-accountcredentials-primary.secret.conf.j2 |  5 +++++
 roles/postal-challenger/tasks/main.yml             | 26 ----------------------
 13 files changed, 31 insertions(+), 52 deletions(-)

diff --git 
a/roles/sms-challenger/files/etc/systemd/system/sms-challenger-httpd.service 
b/roles/challenger/files/etc/systemd/system/sms-challenger-httpd.service
similarity index 100%
rename from 
roles/sms-challenger/files/etc/systemd/system/sms-challenger-httpd.service
rename to roles/challenger/files/etc/systemd/system/sms-challenger-httpd.service
diff --git a/roles/sms-challenger/tasks/main.yml 
b/roles/challenger/tasks/main.yml
similarity index 81%
rename from roles/sms-challenger/tasks/main.yml
rename to roles/challenger/tasks/main.yml
index eb27458..bbd5416 100644
--- a/roles/sms-challenger/tasks/main.yml
+++ b/roles/challenger/tasks/main.yml
@@ -25,11 +25,37 @@
     group: challenger-sms
     mode: 0640
 
+- name: Place Postal challenger config
+  copy:
+    src: etc/challenger/challenger-postal.conf
+    dest: "/etc/challenger/challenger-postal.conf"
+    owner: root
+    group: challenger-postal
+    mode: 0640
+
+- name: Place email challenger config
+  copy:
+    src: etc/challenger/challenger-email.conf
+    dest: "/etc/challenger/challenger-email.conf"
+    owner: root
+    group: challenger-email
+    mode: 0640
+
 - name: Setup SMS Challenger database
   shell:
     cmd: challenger-dbconfig -c /etc/challenger/sms-challenger.conf
     chdir: /tmp
 
+- name: Setup Postal Challenger database
+  shell:
+    cmd: challenger-dbconfig -c /etc/challenger/postal-challenger.conf
+    chdir: /tmp
+
+- name: Setup email Challenger database
+  shell:
+    cmd: challenger-dbconfig -c /etc/challenger/email-challenger.conf
+    chdir: /tmp
+
 - name: Ensure Ansible facts directory dir exists
   file:
     path: "/etc/ansible/facts.d/"
diff --git a/roles/email-challenger/files/etc/challenger/email-challenger.conf 
b/roles/challenger/templates/etc/challenger/email-challenger.conf.j2
similarity index 100%
rename from roles/email-challenger/files/etc/challenger/email-challenger.conf
rename to roles/challenger/templates/etc/challenger/email-challenger.conf.j2
diff --git 
a/roles/postal-challenger/files/etc/challenger/postal-challenger.conf 
b/roles/challenger/templates/etc/challenger/postal-challenger.conf.j2
similarity index 100%
rename from roles/postal-challenger/files/etc/challenger/postal-challenger.conf
rename to roles/challenger/templates/etc/challenger/postal-challenger.conf.j2
diff --git 
a/roles/sms-challenger/templates/etc/challenger/sms-challenger.conf.j2 
b/roles/challenger/templates/etc/challenger/sms-challenger.conf.j2
similarity index 100%
rename from roles/sms-challenger/templates/etc/challenger/sms-challenger.conf.j2
rename to roles/challenger/templates/etc/challenger/sms-challenger.conf.j2
diff --git a/roles/sms-challenger/templates/etc/challenger/sms-challenger.env 
b/roles/challenger/templates/etc/challenger/sms-challenger.env
similarity index 100%
rename from roles/sms-challenger/templates/etc/challenger/sms-challenger.env
rename to roles/challenger/templates/etc/challenger/sms-challenger.env
diff --git a/roles/email-challenger/templates/email-challenger-nginx.conf 
b/roles/challenger/templates/etc/nginx/sites-available/email-challenger-nginx.conf.j2
similarity index 100%
rename from roles/email-challenger/templates/email-challenger-nginx.conf
rename to 
roles/challenger/templates/etc/nginx/sites-available/email-challenger-nginx.conf.j2
diff --git a/roles/postal-challenger/templates/postal-challenger-nginx.conf 
b/roles/challenger/templates/etc/nginx/sites-available/postal-challenger-nginx.conf
similarity index 100%
rename from roles/postal-challenger/templates/postal-challenger-nginx.conf
rename to 
roles/challenger/templates/etc/nginx/sites-available/postal-challenger-nginx.conf
diff --git 
a/roles/sms-challenger/templates/etc/nginx/sites-available/sms-challenger-nginx.conf.j2
 
b/roles/challenger/templates/etc/nginx/sites-available/sms-challenger-nginx.conf.j2
similarity index 100%
rename from 
roles/sms-challenger/templates/etc/nginx/sites-available/sms-challenger-nginx.conf.j2
rename to 
roles/challenger/templates/etc/nginx/sites-available/sms-challenger-nginx.conf.j2
diff --git 
a/roles/sms-challenger/templates/etc/taler-exchange/config.d/sms-challenger.conf.j2
 b/roles/challenger/templates/etc/taler-exchange/config.d/sms-challenger.conf.j2
similarity index 100%
rename from 
roles/sms-challenger/templates/etc/taler-exchange/config.d/sms-challenger.conf.j2
rename to 
roles/challenger/templates/etc/taler-exchange/config.d/sms-challenger.conf.j2
diff --git a/roles/email-challenger/tasks/main.yml 
b/roles/email-challenger/tasks/main.yml
deleted file mode 100644
index a6e6219..0000000
--- a/roles/email-challenger/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: Install Challenger package
-  apt:
-    name:
-      - challenger
-    state: latest
-    update_cache: true
-
-- name: Place email challenger config
-  copy:
-    src: etc/challenger/challenger-email.conf
-    dest: "/etc/challenger/challenger-email.conf"
-    owner: root
-    group: challenger-email
-    mode: 0640
-
-- name: Setup email Challenger database
-  shell:
-    cmd: challenger-dbconfig -c /etc/challenger/email-challenger.conf
-    chdir: /tmp
-
-- name: Ensure email challenger service is enabled and started
-  service:
-    name: email-challenger
-    state: started
-    enabled: yes
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
index 4f8c9ee..43f303f 100644
--- 
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,4 +1,9 @@
 [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 = {{ EXCHANGE_WIRE_GATEWAY_ACCESS_TOKEN }}
diff --git a/roles/postal-challenger/tasks/main.yml 
b/roles/postal-challenger/tasks/main.yml
deleted file mode 100644
index 8b8b2b1..0000000
--- a/roles/postal-challenger/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: Install Challenger package
-  apt:
-    name:
-      - challenger
-    state: latest
-    update_cache: true
-
-- name: Place Postal challenger config
-  copy:
-    src: etc/challenger/challenger-postal.conf
-    dest: "/etc/challenger/challenger-postal.conf"
-    owner: root
-    group: challenger-postal
-    mode: 0640
-
-- name: Setup Postal Challenger database
-  shell:
-    cmd: challenger-dbconfig -c /etc/challenger/postal-challenger.conf
-    chdir: /tmp
-
-- name: Ensure postal challenger service is enabled and started
-  service:
-    name: postal-challenger
-    state: started
-    enabled: yes

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.