[Fusionforge-commits] FusionForge branch master updated. 6.0.4-418-g22db91b

Roland Mas lolando at libremir.placard.fr.eu.org
Tue May 3 20:59:39 CEST 2016


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, master has been updated
       via  22db91bebc20fed0bce1fa4d4a8ce957c586aefd (commit)
      from  92a4005a86863f50e86fb99ba93a64178916b0e8 (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=22db91bebc20fed0bce1fa4d4a8ce957c586aefd

commit 22db91bebc20fed0bce1fa4d4a8ce957c586aefd
Author: Roland Mas <lolando at debian.org>
Date:   Tue May 3 20:59:29 2016 +0200

    Try another way of enabling the unaccent extension

diff --git a/src/db/20160503-configurable-fti-config.sql b/src/db/20160503-configurable-fti-config.sql
index e7c61c5..7405294 100644
--- a/src/db/20160503-configurable-fti-config.sql
+++ b/src/db/20160503-configurable-fti-config.sql
@@ -2,4 +2,3 @@
 -- Its actual content is handled by a PHP script
 
 CREATE TEXT SEARCH CONFIGURATION fusionforge (COPY='simple');
-CREATE EXTENSION IF NOT EXISTS unaccent;
diff --git a/src/post-install.d/db/populate.sh b/src/post-install.d/db/populate.sh
index 58f06a2..9535cbf 100755
--- a/src/post-install.d/db/populate.sh
+++ b/src/post-install.d/db/populate.sh
@@ -70,6 +70,10 @@ cat <<EOF > $PGPASSFILE
 $database_host:$database_port:$database_name:$database_user:$database_password
 EOF
 
+su - postgres -c psql <<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
     echo "Importing initial database..."

-----------------------------------------------------------------------

Summary of changes:
 src/db/20160503-configurable-fti-config.sql | 1 -
 src/post-install.d/db/populate.sh           | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list