[taler-deployment] branch master updated (49c37b9 -> 4fd465d)

[gnunet]

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

dold pushed a change to branch master
in repository deployment.

    from 49c37b9  allow merchant and exchange tag to differ in packaging scripts
     new ae648b3  go with lower postgres version for Ubuntu
     new 4fd465d  detect distro

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 netzbon/functions.sh                                 | 10 ++++++++++
 ...nstall_debian_packages.sh => install_packages.sh} | 20 +++++++++++++++++---
 netzbon/main.sh                                      |  4 ++--
 3 files changed, 29 insertions(+), 5 deletions(-)
 rename netzbon/{install_debian_packages.sh => install_packages.sh} (59%)

diff --git a/netzbon/functions.sh b/netzbon/functions.sh
index afdd12e..b4c265d 100755
--- a/netzbon/functions.sh
+++ b/netzbon/functions.sh
@@ -52,3 +52,13 @@ function assign_user_permissions()
            su - postgres -c "createdb -O $n taler-$n"
     done
 }
+
+# Set DISTRO to the detected distro or return non-zero
+# status if distro not supported.
+function detect_distro()
+{
+  unset DISTRO
+  uname -a | grep Ubuntu >/dev/null && DISTRO=ubuntu && return 0
+  uname -a | grep Debian >/dev/null && DISTRO=debian && return 0
+  return 1
+}
diff --git a/netzbon/install_debian_packages.sh b/netzbon/install_packages.sh
similarity index 59%
rename from netzbon/install_debian_packages.sh
rename to netzbon/install_packages.sh
index fc5afc1..e543aa3 100755
--- a/netzbon/install_debian_packages.sh
+++ b/netzbon/install_packages.sh
@@ -7,8 +7,10 @@ source functions.sh
 source config/user.conf
 source config/internal.conf
 
+detect_distro
+
 # Program versions
-PG_VERSION=15
+PG_VERSION=14
 
 ## Update
 
@@ -28,9 +30,21 @@ apt install uuid-runtime \
 
 ## Add GNU Taler deb.taler.net to /etc/apt/sources.list
 
-say "Adding GNU Taler Debian repository"
+say "Adding GNU Taler apt repository"
+
+case $DISTRO in
+  debian)
+    echo "deb [signed-by=/etc/apt/keyrings/taler-systems.gpg] 
https://deb.taler.net/apt/ubuntu stable main" > 
/etc/apt/sources.list.d/taler.list
+  ;;
+  ubuntu)
+    echo "deb [signed-by=/etc/apt/keyrings/taler-systems.gpg] 
https://deb.taler.net/apt/debian stable main" > 
/etc/apt/sources.list.d/taler.list
+  ;;
+  *)
+    say "Unsupported distro: $DISTRO"
+    exit 1
+  ;;
+esac
 
-echo "deb [signed-by=/etc/apt/keyrings/taler-systems.gpg] 
https://deb.taler.net/apt/debian stable main" > 
/etc/apt/sources.list.d/taler.list
 
 wget -P /etc/apt/keyrings https://taler.net/taler-systems.gpg
 
diff --git a/netzbon/main.sh b/netzbon/main.sh
index 97841db..5848915 100755
--- a/netzbon/main.sh
+++ b/netzbon/main.sh
@@ -79,8 +79,8 @@ fi
 # Check if the user is root, otherwise EXIT.
 check_user
 
-# Installation of Debian packages required
-. install_debian_packages.sh
+# Installation of deb packages required
+. install_packages.sh
 
 if test -z "${NEXUS_EXCHANGE_PASSWORD:-}"
 then

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