ansible-taler-exchange

commit 9c4e3f3ba3e26a56d04739f34ec04f1aa0d8c34e
parent ef9b1ee81183dcaa4c0cebe94c935aa986b06850
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 24 Nov 2024 14:14:07 +0100

combine packages, fix bugs

Diffstat:
M
playbooks/setup.yml
 | 
3
++-
A
roles/common_packages/files/etc/apt/keyrings/taler-systems-nightly.gpg
 | 
0

A
roles/common_packages/files/etc/apt/keyrings/taler-systems.gpg
 | 
0

R
roles/taler-packages/files/etc/apt/preferences.d/limit-taler-repo -> roles/common_packages/files/etc/apt/preferences.d/limit-taler-repo
 | 
0

M
roles/common_packages/tasks/main.yml
 | 
47
+++++++++++++++++++++++++++++++++++++++++++++++
D
roles/taler-packages/tasks/main.yml
 | 
25
-------------------------
D
roles/taler-packages/vars/main.yml
 | 
7
-------

7 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/playbooks/setup.yml b/playbooks/setup.yml
@@ -6,13 +6,14 @@
     - ansible-pull
     - webserver
     - database
-    - taler-packages
     - libeufin-nexus
     - exchange
     - auditor
 # Note that we ONLY define those variables here that are NOT
 # secrets. For secrets, test-secrets.yml contains a template.
   vars:
+# Use nightly Taler distro (true/false).
+    USE_NIGHTLY: false
 # Our currency.
     CURRENCY: CHF
 # Smallest unit of the currency for wire transfers.
diff --git a/roles/common_packages/files/etc/apt/keyrings/taler-systems-nightly.gpg b/roles/common_packages/files/etc/apt/keyrings/taler-systems-nightly.gpg
Binary files differ.
diff --git a/roles/common_packages/files/etc/apt/keyrings/taler-systems.gpg b/roles/common_packages/files/etc/apt/keyrings/taler-systems.gpg
Binary files differ.
diff --git a/roles/taler-packages/files/etc/apt/preferences.d/limit-taler-repo b/roles/common_packages/files/etc/apt/preferences.d/limit-taler-repo
diff --git a/roles/common_packages/tasks/main.yml b/roles/common_packages/tasks/main.yml
@@ -1,6 +1,53 @@
 ---
 # Role: Install dependencies
 
+- name: Deploy TSYS signing key
+  copy:
+    src: etc/apt/keyrings/taler-systems.gpg
+    dest: /etc/apt/keyrings/taler-systems.gpg
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Deploy TSYS nightly signing key
+  copy:
+    src: etc/apt/keyrings/taler-systems-nightly.gpg
+    dest: /etc/apt/keyrings/taler-systems-nightly.gpg
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Add GNU Taler repo
+  deb822_repository:
+    name: Taler
+    types: deb
+    uris: https://deb.taler.net/apt/debian
+    suites: bookworm
+    components:
+      - main
+    architectures: amd64
+    signed_by: /etc/apt/keyrings/taler-systems.gpg
+
+- name: Add GNU Taler nightly repo
+  deb822_repository:
+    name: Taler-nightly
+    types: deb
+    uris: https://deb.taler.net/apt-nightly/
+    suites: bookworm
+    components:
+      - main
+    architectures: amd64
+    signed_by: /etc/apt/keyrings/taler-systems-nightly.gpg
+    enabled: "{{ USE_NIGHTLY }}"
+
+- name: Pin taler repo to lowest priority so they don't auto upgrade
+  copy:
+    src: etc/apt/preferences.d/limit-taler-repo
+    dest: /etc/apt/preferences.d/limit-taler-repo
+    owner: root
+    group: root
+    mode: 0644
+
 - name: Deploy current base distro
   apt:
     state: latest
diff --git a/roles/taler-packages/tasks/main.yml b/roles/taler-packages/tasks/main.yml
@@ -1,25 +0,0 @@
----
-# FOR PRODUCTION
-# Add Taler public APT package repo
-#- name: GNU/Taler repo
-#  deb822_repository:
-#    name: Taler
-#    types: deb
-#    uris: https://deb.taler.net/apt/debian
-#    suites: bookworm
-#    components:
-#      - main
-#    architectures: amd64
-#    signed_by: https://taler.net/taler-systems.gpg
-
-- name: Nightly repo
-  shell:
-    cmd: curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources -o /etc/apt/sources.list.d/taler.sources
-
-- name: Pin taler repo to lowest priority so they don't auto upgrade
-  copy:
-    src: etc/apt/preferences.d/limit-taler-repo
-    dest: /etc/apt/preferences.d/limit-taler-repo
-    owner: root
-    group: root
-    mode: 0644
diff --git a/roles/taler-packages/vars/main.yml b/roles/taler-packages/vars/main.yml
@@ -1,7 +0,0 @@
-BANK_EXCHANGE_PASSWORD: xxxx
-BANK_ADMIN_PASSWORD: xxxx
-BANK_PORT: xxxx
-CURRENCY_NAME: xxxx
-IBAN: xxx
-HOSTNAME: XXXX
-TOS: yes/no