[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.3-91-g1c4fde4

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Mar 11 15:47:41 CET 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, 6.0 has been updated
       via  1c4fde46a8cd1b58a177413e6faf33cee3938571 (commit)
       via  be0d3cb1783f76d0c1631cf18c7c9303b96556f4 (commit)
       via  54b44d70d094ef5e8dfec82dc943f4af4687e9b5 (commit)
       via  d12c6dfd35c2829119e5eb46c4023adf69520e94 (commit)
      from  64d39eb038118eb02dbe1bd2c17fd01daf451a1e (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=1c4fde46a8cd1b58a177413e6faf33cee3938571

commit 1c4fde46a8cd1b58a177413e6faf33cee3938571
Author: Roland Mas <roland at gnurandal.com>
Date:   Thu Mar 10 15:34:01 2016 +0100

    Added script to rebuild full-text indices

diff --git a/src/bin/rebuild-fti-indices.php b/src/bin/rebuild-fti-indices.php
new file mode 100755
index 0000000..ec98c10
--- /dev/null
+++ b/src/bin/rebuild-fti-indices.php
@@ -0,0 +1,42 @@
+#!/usr/bin/php -f
+<?php
+/**
+ * Copyright 2016, Roland Mas
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+require (dirname(__FILE__).'/../common/include/env.inc.php');
+require_once $gfcommon."include/pre.php";
+$f = array(
+	'groups' => 'short_description',
+	'artifact' => 'summary',
+	'artifact_message' => 'body',
+	'doc_data' => 'title',
+	'forum' => 'subject',
+	'frs_file' => 'filename',
+	'frs_release' => 'name',
+	'news_bytes' => 'summary',
+	'project_task' => 'summary',
+	'project_messages' => 'body',
+	'skills_data' => 'keywords',
+	'users' => 'realname',
+);
+
+foreach ($f as $table => $column) {
+	echo "Regenerating FTI indices for table $table.\n";
+	$res = db_query_params ("UPDATE $table SET $column=$column");
+}

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=be0d3cb1783f76d0c1631cf18c7c9303b96556f4

commit be0d3cb1783f76d0c1631cf18c7c9303b96556f4
Author: Roland Mas <roland at gnurandal.com>
Date:   Thu Mar 10 14:54:28 2016 +0100

    Make full-text search configuration configurable
    
    This allows setting up, e.g. a French instance of FusionForge, where
    search uses French dictionaries and rules for normalizing lexemes.

diff --git a/src/common/include/database-pgsql.php b/src/common/include/database-pgsql.php
index 47a1aa4..a0b49f8 100644
--- a/src/common/include/database-pgsql.php
+++ b/src/common/include/database-pgsql.php
@@ -111,7 +111,7 @@ function db_connect() {
 
 	$res = db_query_params ('SELECT set_config($1, $2, false)',
 				array('default_text_search_config',
-				      'simple'));
+                      forge_get_config('fti_config')));
 
 	// Register top-level "finally" handler to abort current
 	// transaction in case of error
diff --git a/src/etc/config.ini.d/defaults.ini b/src/etc/config.ini.d/defaults.ini
index 597977d..807702e 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -58,6 +58,7 @@ use_docman = yes
 use_forum = yes
 use_frs = yes
 use_fti = yes
+fti_config = simple
 use_ftp = yes
 use_ftp_uploads = no
 use_gateways = yes

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=54b44d70d094ef5e8dfec82dc943f4af4687e9b5

commit 54b44d70d094ef5e8dfec82dc943f4af4687e9b5
Author: Roland Mas <lolando at debian.org>
Date:   Fri Mar 11 10:20:52 2016 +0100

    Use configured path for SCM repos

diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index ebd0820..6ef7ae6 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -48,11 +48,8 @@ class SVNPlugin extends SCMPlugin {
 _("This plugin contains the Subversion subsystem of FusionForge. It allows
 each FusionForge project to have its own Subversion repository, and gives
 some control over it to the project's administrator.");
-		$this->svn_root_fs = '/scmrepos/svn';
-		if (!file_exists($this->svn_root_fs.'/.')) {
-			$this->svn_root_fs = forge_get_config('repos_path',
-			    $this->name);
-		}
+		$this->svn_root_fs = forge_get_config('repos_path',
+											  $this->name);
 		$this->svn_root_dav = '/svn';
 		$this->_addHook('scm_browser_page');
 		$this->_addHook('scm_update_repolist');

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d12c6dfd35c2829119e5eb46c4023adf69520e94

commit d12c6dfd35c2829119e5eb46c4023adf69520e94
Author: Roland Mas <roland at gnurandal.com>
Date:   Thu Mar 10 11:39:06 2016 +0100

    Removed obsolete code

diff --git a/src/plugins/scmcvs/bin/install.sh b/src/plugins/scmcvs/bin/install.sh
index 5e19dbd..cff00ee 100755
--- a/src/plugins/scmcvs/bin/install.sh
+++ b/src/plugins/scmcvs/bin/install.sh
@@ -34,8 +34,6 @@ case "$1" in
 	update-inetd --comment-chars "#SF_WAS_HERE#" --disable cvspserver
 	update-inetd --add  "cvspserver	stream	tcp	nowait.400	root	/usr/sbin/tcpd	$source_path/plugins/scmcvs/sbin/cvs-pserver"
 
-	# Making user group and cvs update from database 
-	$source_path/plugins/scmcvs/bin/update-user-group-ssh.sh > /dev/null 2>&1
 	rm -f $data_path/dumps/*cvs*dump
 
 	if [ ! -e $data_path/chroot/cvs ] ; then
@@ -43,10 +41,6 @@ case "$1" in
 	    ln -s cvsroot cvs
 	fi
 
-	# logs
-	chown root:gforge $log_path/cvs
-	chmod 775 $log_path/cvs
-
 	# Restart some services
 	[ -d /etc/ssh ] && invoke-rc.d ssh restart || true
 	[ -d /etc/ssh-nonfree ] && invoke-rc.d ssh-nonfree restart || true

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

Summary of changes:
 .../{list-admins.php => rebuild-fti-indices.php}   | 25 +++++++++++++++++-----
 src/common/include/database-pgsql.php              |  2 +-
 src/etc/config.ini.d/defaults.ini                  |  1 +
 src/plugins/scmcvs/bin/install.sh                  |  6 ------
 src/plugins/scmsvn/common/SVNPlugin.class.php      |  7 ++----
 5 files changed, 24 insertions(+), 17 deletions(-)
 copy src/bin/{list-admins.php => rebuild-fti-indices.php} (62%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list