[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: -fix pgsql script
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: -fix pgsql script |
Date: |
Tue, 24 Aug 2021 20:04:00 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new a1e53437 -fix pgsql script
a1e53437 is described below
commit a1e53437d8d277dca5e8e646eea16457532ddafb
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Aug 24 20:03:58 2021 +0200
-fix pgsql script
---
debian/db/install/pgsql | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql
index 8118fb7b..bb446c25 100755
--- a/debian/db/install/pgsql
+++ b/debian/db/install/pgsql
@@ -1,19 +1,16 @@
#!/bin/sh
-
set -eu
-
merchantdb_secretconf=/etc/taler/secrets/merchant-db.secret.conf
merchantdb_overrideconf=/etc/taler/overrides.conf
-
# get database settings from dbconfig-common and configure
# for ADMINISTRATIVE access
if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then
. /etc/dbconfig-common/taler-merchant.conf
case "$dbc_dbtype" in
pgsql)
- echo -e "[merchant]\nDB=postgres\n\n" >
+ echo -e "[merchant]\nDB=postgres\n\n" > \
$merchantdb_overrideconf
- echo -e
"[merchantdb-postgres]\nCONFIG=postgres:///${dbc_dbname}\n\n" >
+ echo -e
"[merchantdb-postgres]\nCONFIG=postgres:///${dbc_dbname}\n\n" > \
$merchantdb_secretconf
;;
sqlite3)
@@ -31,11 +28,8 @@ if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then
;;
esac
fi
-
# Run database initialization logic
sudo -u postgres taler-merchant-dbinit -c /etc/taler/taler.conf
-
-
# get database settings from dbconfig-common and configure
# for service access!
if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then
@@ -47,9 +41,9 @@ if [ -f /etc/dbconfig-common/taler-merchant.conf ]; then
echo "GRANT SELECT, UPDATE ON ALL SEQUENCES IN SCHEMA public TO
\"$dbc_dbuser\";" \
| sudo -u postgres psql "postgres:///$dbc_dbname"
- echo -e
"[merchantdb-postgres]\nCONFIG=postgres://${dbc_user}:${dbc_dbpass}@${dbc_dbserver}/${dbc_dbname}\n\n"
>
+ echo -e
"[merchantdb-postgres]\nCONFIG=postgres://${dbc_user}:${dbc_dbpass}@${dbc_dbserver}/${dbc_dbname}\n\n"
> \
$merchantdb_secretconf
- echo -e "[merchant]\nDB=postgres\n\n" >
+ echo -e "[merchant]\nDB=postgres\n\n" > \
$merchantdb_overrideconf
;;
sqlite3)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: -fix pgsql script,
gnunet <=