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.1 has been updated
via acf734d08f511ea61382ddc3502cfecdab5d1ebc (commit)
via 0bf945ee82993489f23a9f008b3e5eeee0b7f306 (commit)
from bcc9786d972658e7f68d889c8145934eeb506786 (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=acf734d08f511ea61382ddc3502cfecdab5d1ebc
commit acf734d08f511ea61382ddc3502cfecdab5d1ebc
Merge: bcc9786 0bf945e
Author: Franck Villaume <[email protected]>
Date: Wed Aug 22 12:19:22 2018 +0000
Merge 6.0
diff --cc src/post-install.d/db/populate.sh
index 273fc9b,ff2d86a..a6248a7
--- a/src/post-install.d/db/populate.sh
+++ b/src/post-install.d/db/populate.sh
@@@ -68,14 -68,12 +68,16 @@@ cat <<EOF > $PGPASSFIL
$database_host:$database_port:$database_name:$database_user:$database_password
EOF
- su - postgres -c "psql $database_name" <<EOF >/dev/null
+ PSQL_WITH_OPTS="psql -h $database_host -p $database_port -U $database_user
$database_name"
+
++$PSQL_WITH_OPTS <<EOF >/dev/null
+CREATE EXTENSION IF NOT EXISTS unaccent;
+EOF
+
# 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_WITH_OPTS < $source_path/db/1-fusionforge-init.sql >/dev/null
++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
@@@ -93,8 -91,8 +95,8 @@@ EO
# 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
++ $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',
'[email protected]',
-----------------------------------------------------------------------
Summary of changes:
src/post-install.d/db/populate.sh | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
