[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 6006ba00a1cbd11f81fa5545b914aa62695c7175

Sylvain Beucler beuc-inria at fusionforge.org
Fri Nov 28 12:15:34 CET 2014


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, Branch_5_3 has been updated
       via  6006ba00a1cbd11f81fa5545b914aa62695c7175 (commit)
       via  f7c41253e98aac4972246d3cfdb0739cd40547ab (commit)
      from  a9b6e28afdc9aeeba2a70d904a31db25839dabc6 (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 -----------------------------------------------------------------
commit 6006ba00a1cbd11f81fa5545b914aa62695c7175
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Nov 28 12:15:04 2014 +0100

    nscd: reload before running cronjobs, otherwise some of them fail randomly

diff --git a/src/common/include/cron_utils.php b/src/common/include/cron_utils.php
index 4b23ca7..ce541ac 100644
--- a/src/common/include/cron_utils.php
+++ b/src/common/include/cron_utils.php
@@ -145,6 +145,14 @@ function cron_remove_lock($name) {
 	return false;
 }
 
+//
+// Reload NSCD, in particular when replicating new groups, users or
+// project memberships
+// 
+function cron_reload_nscd() {
+        system("(nscd -i passwd && nscd -i group) >/dev/null 2>&1");
+}
+
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"
diff --git a/src/cronjobs/create_scm_repos.php b/src/cronjobs/create_scm_repos.php
index 0121df1..c5e8076 100755
--- a/src/cronjobs/create_scm_repos.php
+++ b/src/cronjobs/create_scm_repos.php
@@ -32,6 +32,9 @@ require_once $gfcommon.'include/PluginManager.class.php' ;
 // SCM-specific plugins subsystem
 require_once $gfcommon.'include/SCMPlugin.class.php' ;
 
+// Sync nss-pgsql
+cron_reload_nscd();
+
 session_set_admin ();
 
 setup_plugin_manager();
diff --git a/src/cronjobs/homedirs.php b/src/cronjobs/homedirs.php
index 3c01d7c..9b4f418 100755
--- a/src/cronjobs/homedirs.php
+++ b/src/cronjobs/homedirs.php
@@ -60,6 +60,9 @@ require dirname(__FILE__).'/../common/include/env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require $gfcommon.'include/cron_utils.php';
 
+// Sync nss-pgsql
+cron_reload_nscd();
+
 setup_gettext_from_sys_lang();
 define('USER_DEFAULT_GROUP', 'users');
 // error variable
diff --git a/src/cronjobs/ssh_create.php b/src/cronjobs/ssh_create.php
index 06a8bd7..1c6a66a 100755
--- a/src/cronjobs/ssh_create.php
+++ b/src/cronjobs/ssh_create.php
@@ -31,6 +31,9 @@ require dirname(__FILE__).'/../common/include/env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require $gfcommon.'include/cron_utils.php';
 
+// Sync nss-pgsql
+cron_reload_nscd();
+
 function create_authkeys($params) {
 	$sshdir = $params['sshdir'];
 	$sshkeys = $params['sshkeys'];
diff --git a/tests/func/PluginsScmSvn/svnSSHTest.php b/tests/func/PluginsScmSvn/svnSSHTest.php
index 4344204..7f68bd0 100644
--- a/tests/func/PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/PluginsScmSvn/svnSSHTest.php
@@ -40,7 +40,6 @@ class ScmSvnSSHTest extends FForge_SeleniumTestCase
 		$this->uploadSshKey();
 	    
 		// Run the cronjob to create repositories
-		$this->reload_nscd();
 		$this->cron("create_scm_repos.php");
 		$this->cron("homedirs.php");
 		$this->cron("ssh_create.php");

commit f7c41253e98aac4972246d3cfdb0739cd40547ab
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Nov 28 12:03:29 2014 +0100

    Document recent CHANGES

diff --git a/src/CHANGES b/src/CHANGES
index ee46221..46ef0e1 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,10 +1,13 @@
 Fusionforge-5.3.3:
+* User e-mail change: simplify confirmation hash to avoid mangling in some versions of Thunderbird [#738] (Inria)
+* SCM: use 'shell_host' variable (or failing that, 'web_host') to document where users can SSH to the group shared directory [#698] (Inria)
+* SCM stats: fix order in stats block [#736] (TrivialDev)
 * Plugin AuthLDAP: error and warning messages displayed twice [#732] (TrivialDev)
 * Plugin scmhook: fix display when only one SCM plugin enabled [#735] (TrivialDev)
 * Plugin Hudson: fix global status in Hudson Job widget [#740] (TrivialDev)
 * Plugin Hudson: delete jobs on project deletion [#742] (TrivialDev)
+* Plugin MediaWiki: activate MediaWiki extensions (in the database) when creating a new project wiki (Thorsten Glaser & Inria)
 * Plugin OSLC: Undefined index: is_public [#748] (TrivialDev)
-* Stats SCM: fix order in stats block [#736] (TrivialDev)
 
 Fusionforge-5.3.2:
 * Software map: fix "value too long for type character varying(255)" error in cron db_trove_maint.php (Inria)

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

Summary of changes:
 src/CHANGES                             |    5 ++++-
 src/common/include/cron_utils.php       |    8 ++++++++
 src/cronjobs/create_scm_repos.php       |    3 +++
 src/cronjobs/homedirs.php               |    3 +++
 src/cronjobs/ssh_create.php             |    3 +++
 tests/func/PluginsScmSvn/svnSSHTest.php |    1 -
 6 files changed, 21 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list