[taler-grid5k] 83/141: update image - set install path to /usr instead of /usr/local

[gnunet]

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

marco-boss pushed a commit to branch master
in repository grid5k.

commit 2b23c675f304db08b982aa807a6c3c9424d44c09
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Fri Oct 29 17:15:12 2021 +0200

    update image - set install path to /usr instead of /usr/local
---
 .../usr/lib/systemd/system/taler-exchange.target   | 12 ++++
 experiment/scripts/createusers.sh                  | 80 ++++++++++++++++++++++
 experiment/scripts/wallet.sh                       |  1 +
 experiment/setup.sh                                |  2 +
 image/taler-debian11.yaml                          |  4 +-
 5 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/configs/usr/lib/systemd/system/taler-exchange.target 
b/configs/usr/lib/systemd/system/taler-exchange.target
new file mode 100644
index 0000000..eea37c8
--- /dev/null
+++ b/configs/usr/lib/systemd/system/taler-exchange.target
@@ -0,0 +1,12 @@
+[Unit]
+Description=GNU Taler exchange
+After=postgres.service network.target
+
+Wants=taler-exchange-httpd.service
+Wants=taler-exchange-wirewatch.service
+Wants=taler-exchange-aggregator.service
+Wants=taler-exchange-closer.service
+Wants=taler-exchange-transfer.service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/experiment/scripts/createusers.sh 
b/experiment/scripts/createusers.sh
new file mode 100755
index 0000000..9dd76ae
--- /dev/null
+++ b/experiment/scripts/createusers.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+TALER_HOME="/var/lib/taler"
+_GROUPNAME=taler-exchange-secmod
+_DBGROUPNAME=taler-exchange-db
+_EUSERNAME=taler-exchange-httpd
+_CLOSERUSERNAME=taler-exchange-closer
+_RSECUSERNAME=taler-exchange-secmod-rsa
+_ESECUSERNAME=taler-exchange-secmod-eddsa
+_AGGRUSERNAME=taler-exchange-aggregator
+_WIREUSERNAME=taler-exchange-wire
+
+TALER_HOME="/var/lib/taler"
+
+# Create taler groups as needed
+if ! getent group ${_GROUPNAME} >/dev/null; then
+  addgroup --quiet --system ${_GROUPNAME}
+fi
+if ! getent group ${_DBGROUPNAME} >/dev/null; then
+  addgroup --quiet --system ${_DBGROUPNAME}
+fi
+if ! getent group taler-exchange-offline >/dev/null; then
+  addgroup --quiet --system taler-exchange-offline
+fi
+
+# Create taler users if needed
+if ! getent passwd ${_EUSERNAME} >/dev/null; then
+  adduser --quiet --system --no-create-home --ingroup ${_GROUPNAME} --home 
${TALER_HOME} ${_EUSERNAME}
+  adduser --quiet ${_EUSERNAME} ${_DBGROUPNAME}
+fi
+if ! getent passwd ${_RSECUSERNAME} >/dev/null; then
+  adduser --quiet --system --no-create-home --ingroup ${_GROUPNAME} --home 
${TALER_HOME} ${_RSECUSERNAME}
+fi
+if ! getent passwd ${_ESECUSERNAME} >/dev/null; then
+  adduser --quiet --system --no-create-home --ingroup ${_GROUPNAME} --home 
${TALER_HOME} ${_ESECUSERNAME}
+fi
+if ! getent passwd ${_WIREUSERNAME} >/dev/null; then
+  adduser --quiet --system --no-create-home --home ${TALER_HOME} 
${_WIREUSERNAME}
+  adduser --quiet ${_WIREUSERNAME} ${_DBGROUPNAME}
+fi
+if ! getent passwd ${_CLOSERUSERNAME} >/dev/null; then
+  adduser --quiet --system --no-create-home --home ${TALER_HOME} 
${_CLOSERUSERNAME}
+  adduser --quiet ${_CLOSERUSERNAME} ${_DBGROUPNAME}
+fi
+if ! getent passwd ${_AGGRUSERNAME} >/dev/null; then
+  adduser --quiet --system --no-create-home --home ${TALER_HOME} 
${_AGGRUSERNAME}
+  adduser --quiet ${_AGGRUSERNAME} ${_DBGROUPNAME}
+fi
+if ! getent passwd taler-exchange-offline >/dev/null; then
+  adduser --quiet --system \
+    --ingroup taler-exchange-offline \
+    --no-create-home \
+    --home ${TALER_HOME} taler-exchange-offline
+fi
+
+install -d /var/lib/taler/exchange-offline -m 0700 -o taler-exchange-offline 
-g taler-exchange-offline 
+install -d /run/taler/exchange-secmod-rsa -m 0755 -o taler-exchange-secmod-rsa 
-g taler-exchange-secmod
+install -d /run/taler/exchange-secmod-eddsa -m 0755 -o 
taler-exchange-secmod-eddsa -g taler-exchange-secmod
+install -d /run/taler/exchange-httpd -m 0750 -o taler-exchange-httpd -g 
www-data
+install -d /var/lib/taler/exchange-offline -m 0700 -o taler-exchange-offline 
-g taler-exchange-offline
+install -d /var/lib/taler/exchange-secmod-rsa -m 0700 -o 
taler-exchange-secmod-rsa -g taler-exchange-secmod
+install -d /var/lib/taler/exchange-secmod-eddsa -m 0700 o 
taler-exchange-secmod-eddsa -g taler-exchange-secmod
+
+if ! dpkg-statoverride --list 
/etc/taler/secrets/exchange-accountcredentials.secret.conf >/dev/null 2>&1; then
+  dpkg-statoverride --add --update \
+    ${_WIREUSERNAME} root 460 \
+    /etc/taler/secrets/exchange-accountcredentials.secret.conf
+fi
+
+if ! dpkg-statoverride --list /etc/taler/secrets/exchange-db.secret.conf 
>/dev/null 2>&1; then
+  dpkg-statoverride --add --update \
+    root ${_DBGROUPNAME} 660 \
+    /etc/taler/secrets/exchange-db.secret.conf
+fi
+
+exit 0
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
index 1707b07..045b049 100755
--- a/experiment/scripts/wallet.sh
+++ b/experiment/scripts/wallet.sh
@@ -2,6 +2,7 @@
 set -eux
 
 if [[ "$1" == "init" ]]; 
+then
   source ~/scripts/helpers.sh
   wait_for_keys "${PROXY_DOMAIN}"
   sleep 5
diff --git a/experiment/setup.sh b/experiment/setup.sh
index bb3e4d8..a530cfb 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -39,4 +39,6 @@ fi
 
 systemctl daemon-reload
 
+exec ~/scripts/createusers.sh
+
 exit 0
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index e5ce5f7..f5a4a26 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -88,14 +88,14 @@ setup:
 
          # GNUNet
          tar -xvf gnunet.tar.gz
-         cd gnunet-* && ./configure --enable-logging=verbose && make && make 
install 
+         cd gnunet-* && ./configure --enable-logging=verbose --prefix=/usr && 
make && make install 
          ldconfig
 
          # Exchange
          cd /root
          pip install jinja2
          tar -xvf exchange.tar.gz
-         cd taler-exchange* && ./configure --enable-logging=verbose && make && 
make install
+         cd taler-exchange* && ./configure --enable-logging=verbose 
--prefix=/usr && make && make install
          ldconfig
 
          # Wallet

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