This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via 0bf945ee82993489f23a9f008b3e5eeee0b7f306 (commit)
from ef69428c26c6c4ccb4b94696b1abb58d055ab6ba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0bf945ee82993489f23a9f008b3e5eeee0b7f306
commit 0bf945ee82993489f23a9f008b3e5eeee0b7f306
Author: Roland Mas <roland....@gnurandal.com>
Date: Sat Aug 18 12:54:22 2018 +0200
Connect to actual DB (possibly remote) during upgrades
diff --git a/src/post-install.d/db/populate.sh
b/src/post-install.d/db/populate.sh
index f3be451..ff2d86a 100755
--- a/src/post-install.d/db/populate.sh
+++ b/src/post-install.d/db/populate.sh
@@ -68,17 +68,19 @@ cat <<EOF > $PGPASSFILE
$database_host:$database_port:$database_name:$database_user:$database_password
EOF
+PSQL_WITH_OPTS="psql -h $database_host -p $database_port -U $database_user
$database_name"
+
# Database init
-if ! su - postgres -c "psql $database_name -c 'SELECT COUNT(*) FROM users;'"
>/dev/null 2>&1; then
+if ! $PSQL_WITH_OPTS -c 'SELECT COUNT(*) FROM users;' >/dev/null 2>&1; then
echo "Importing initial database..."
- psql -h $database_host -p $database_port -U $database_user $database_name
< $source_path/db/1-fusionforge-init.sql >/dev/null
+ $PSQL_WITH_OPTS < $source_path/db/1-fusionforge-init.sql >/dev/null
fi
# Database upgrade
$source_path/post-install.d/db/upgrade.php
# Additional grants
-psql -h $database_host -p $database_port -U $database_user $database_name
<<EOF >/dev/null
+$PSQL_WITH_OPTS <<EOF >/dev/null
GRANT SELECT ON nss_passwd TO ${database_user}_nss;
GRANT SELECT ON nss_groups TO ${database_user}_nss;
GRANT SELECT ON nss_usergroups TO ${database_user}_nss;
@@ -89,8 +91,8 @@ EOF
# Admin user
req="SELECT COUNT(*) FROM users WHERE user_name='admin'"
-if [ "$(echo $req | su - postgres -c "psql -At $database_name")" != "1" ]; then
- psql -h $database_host -p $database_port -U $database_user $database_name
<<EOF >/dev/null
+if [ "$(echo $req | $PSQL_WITH_OPTS -At)" != "1" ]; then
+ $PSQL_WITH_OPTS <<EOF >/dev/null
INSERT INTO users (user_name, realname, firstname, lastname, email,
unix_pw, status, theme_id)
VALUES ('admin', 'Forge Admin', 'Forge', 'Admin',
'root@localhost.localdomain',
-----------------------------------------------------------------------
Summary of changes:
src/post-install.d/db/populate.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
