taler-deployment

commit 77d514e4db271565cc0fe6afae7b35d73c6faa44
parent e8e079144e876c99e610ca4372f1a1931a462cbc
Author: Hernâni Marques <hernani+magikoopa@vecirex.net>
Date:   Sat,  5 Sep 2026 16:51:53 +0200

compat: pin arch of APT pkgs to host arch; tested on arm64/Silicon

Diffstat:
M
regional-currency-ng/roles/regional_currency/defaults/main.yml
 | 
3
+++
M
regional-currency-ng/roles/regional_currency/tasks/packages.yml
 | 
4
++--
M
regional-currency/install_packages.sh
 | 
12
++++++++----

3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/regional-currency-ng/roles/regional_currency/defaults/main.yml b/regional-currency-ng/roles/regional_currency/defaults/main.yml
@@ -1,5 +1,8 @@
 ---
 regional_currency_currency: NETZBON
+# deb822 Architectures: — uname arch → Debian package arch (amd64 pin broke native arm64)
+regional_currency_apt_architecture: >-
+  {{ {'x86_64': 'amd64', 'aarch64': 'arm64', 'armv7l': 'armhf'}.get(ansible_facts['architecture'], ansible_facts['architecture']) }}
 regional_currency_domain: ""
 regional_currency_bank_name: Taler Bank
 regional_currency_bank_admin_password: ""
diff --git a/regional-currency-ng/roles/regional_currency/tasks/packages.yml b/regional-currency-ng/roles/regional_currency/tasks/packages.yml
@@ -33,7 +33,7 @@
     components:
       - main
     architectures:
-      - amd64
+      - "{{ regional_currency_apt_architecture }}"
     signed_by: /etc/apt/keyrings/taler-systems.gpg
     state: present
     install_python_debian: true
@@ -51,7 +51,7 @@
     components:
       - main
     architectures:
-      - amd64
+      - "{{ regional_currency_apt_architecture }}"
     signed_by: /etc/apt/keyrings/taler-systems.gpg
     state: present
     install_python_debian: true
diff --git a/regional-currency/install_packages.sh b/regional-currency/install_packages.sh
@@ -7,6 +7,9 @@ source functions.sh
 
 detect_distro
 
+# Debian package architecture (do not hardcode amd64 — arm64 trixie has binary-arm64)
+APT_ARCH=$(dpkg --print-architecture)
+
 # Program versions
 PG_VERSION=$( ./postgres_version.sh )
 
@@ -57,7 +60,7 @@ case $DISTRO in
 debian)
   if test "${APT_TESTING:-n}" == y; then
     cat >/etc/apt/sources.list.d/taler.sources <<EOF
-Architectures: amd64
+Architectures: $APT_ARCH
 Components: main
 X-Repolib-Name: Taler
 Signed-By: /etc/apt/keyrings/taler-systems.gpg
@@ -65,11 +68,11 @@ Suites: $VERSION_CODENAME-testing
 Types: deb
 URIs: https://deb.taler.net/apt/debian
 EOF
-    say "Setup $VERSION_CODENAME-testing packages"
+    say "Setup $VERSION_CODENAME-testing packages ($APT_ARCH)"
     wget -O /etc/apt/keyrings/taler-systems.gpg https://taler.net/taler-systems.gpg &>> setup.log
   else
     cat >/etc/apt/sources.list.d/taler.sources <<EOF
-Architectures: amd64
+Architectures: $APT_ARCH
 Components: main
 X-Repolib-Name: Taler
 Signed-By: /etc/apt/keyrings/taler-systems.gpg
@@ -77,11 +80,12 @@ Suites: $VERSION_CODENAME
 Types: deb
 URIs: https://deb.taler.net/apt/debian
 EOF
+    say "Setup $VERSION_CODENAME packages ($APT_ARCH)"
     wget -O /etc/apt/keyrings/taler-systems.gpg https://taler.net/taler-systems.gpg &>> setup.log
   fi
   ;;
 ubuntu)
-  echo "deb [signed-by=/etc/apt/keyrings/taler-systems.gpg] https://deb.taler.net/apt/ubuntu $VERSION_CODENAME main" >/etc/apt/sources.list.d/taler.list
+  echo "deb [arch=$APT_ARCH signed-by=/etc/apt/keyrings/taler-systems.gpg] https://deb.taler.net/apt/ubuntu $VERSION_CODENAME main" >/etc/apt/sources.list.d/taler.list
   wget -O /etc/apt/keyrings/taler-systems.gpg https://taler.net/taler-systems.gpg &>> setup.log
   ;;
 *)