[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 910b0ecd1a317b1eff84f728b913562a1c473802

[Roland Mas]

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  910b0ecd1a317b1eff84f728b913562a1c473802 (commit)
      from  68b600a729e6d69e0cd394e5581da07f54c10f0a (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 910b0ecd1a317b1eff84f728b913562a1c473802
Author: Roland Mas <lolando at debian.org>
Date:   Fri Mar 21 14:09:33 2014 +0100

    Move jobs from scmcvs to main crontab; also replaces Debian-specific Perl script with standard homedirs.php+ssh_create.php

diff --git a/src/packaging/cron.d/fusionforge b/src/packaging/cron.d/fusionforge
index edf65ee..eafbe37 100644
--- a/src/packaging/cron.d/fusionforge
+++ b/src/packaging/cron.d/fusionforge
@@ -71,6 +71,9 @@ PATH=@BINARY_PATH@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 # Create the shell users accounts and groups home directories
 15 * * * * root forge_run_job homedirs.php
 
+# SSH keys
+20 * * * * root forge_run_job ssh_create.php
+
 # Create the new mailing lists
 06 * * * * root forge_run_job mail/mailing_lists_create.php
 
diff --git a/src/packaging/cron.d/shell-postgresql b/src/packaging/cron.d/shell-postgresql
index 1ddedf7..41966e6 100644
--- a/src/packaging/cron.d/shell-postgresql
+++ b/src/packaging/cron.d/shell-postgresql
@@ -3,4 +3,7 @@
 #
 
 # SCM/user/group update
-0 * * * * root [ -x @BINARY_PATH@/update-user-group-ssh.sh ] && @BINARY_PATH@/update-user-group-ssh.sh > /dev/null 2>&1
+15 * * * * root forge_run_job homedirs.php
+
+# SSH keys
+20 * * * * root forge_run_job ssh_create.php
diff --git a/src/plugins/scmcvs/cron.d/fusionforge-plugin-scmcvs b/src/plugins/scmcvs/cron.d/fusionforge-plugin-scmcvs
index d0a87d0..3f4b96d 100644
--- a/src/plugins/scmcvs/cron.d/fusionforge-plugin-scmcvs
+++ b/src/plugins/scmcvs/cron.d/fusionforge-plugin-scmcvs
@@ -22,11 +22,6 @@ MAILTO=""
 #10 * * * * root $PHP $FUSIONFORGE/plugins/scmcvs/cronjobs/usergroup.php
 
 #
-#       Upload the SSH key files
-#
-15 * * * * root $PHP $FUSIONFORGE/plugins/scmcvs/cronjobs/ssh_create.php
-
-#
 #       Create the blank cvs trees
 #
 20 * * * * root $PHP $FUSIONFORGE/plugins/scmcvs/cronjobs/cvs.php

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

Summary of changes:
 src/packaging/cron.d/fusionforge                    |    3 +++
 src/packaging/cron.d/shell-postgresql               |    5 ++++-
 src/plugins/scmcvs/cron.d/fusionforge-plugin-scmcvs |    5 -----
 3 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FusionForge