[Fusionforge-commits] FusionForge branch master updated. 0db6895 Merge branch '6.0'

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Jun 11 09:56:18 CEST 2015


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  0db6895337932e37e1e77a4dd117d12144f2ade5 (commit)
       via  33726e533223c35803230d95da85315931fcad9f (commit)
       via  e0e508c68bfa929c39a0355575a2c83c51cd5cb1 (commit)
       via  855c7ee0b6b9df429b36ad91225aa0fa3f0e69d1 (commit)
       via  3d61c0b337476d6dd04c577de781de29e410a3ae (commit)
      from  ee2aa468f8593082f193fd3228375853e7328643 (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 0db6895337932e37e1e77a4dd117d12144f2ade5
Merge: ee2aa46 33726e5
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jun 11 09:55:59 2015 +0200

    Merge branch '6.0'


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

Summary of changes:
 src/GNUmakefile                                            |  4 ++++
 src/db/20140710-forum-migrate-attachments-to-fs.php        | 14 +++++++-------
 src/etc/cron.d/fusionforge-scm                             |  3 ---
 src/etc/cron.d/fusionforge-web                             |  8 ++++++++
 .../library/scmsvn/hooks/commitemail/commit-email.pl       |  6 +++---
 .../scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc    |  2 +-
 6 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 src/etc/cron.d/fusionforge-web

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 6fa991d..5845f07 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -107,6 +107,10 @@ install-web: install-base-dirs
 		sed 's, at log_path@,$(log_path),g' etc/logrotate.d/fusionforge-web \
 			> $(DESTDIR)$(sysconfdir)/logrotate.d/fusionforge-web; \
 	fi
+	if [ ! -e $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-web ]; then \
+		sed 's, at bindir@,$(bindir),' etc/cron.d/fusionforge-web \
+			> $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-web; \
+	fi
 #	TODO: multiple servers support?
 #	(e.g. install scm, lists, vhosts and vhosts-extra separately)
 
diff --git a/src/db/20140710-forum-migrate-attachments-to-fs.php b/src/db/20140710-forum-migrate-attachments-to-fs.php
index 89d7593..b90e478 100644
--- a/src/db/20140710-forum-migrate-attachments-to-fs.php
+++ b/src/db/20140710-forum-migrate-attachments-to-fs.php
@@ -29,14 +29,14 @@ require_once $gfcommon.'forum/ForumStorage.class.php';
 ini_set('memory_limit', -1);
 ini_set('max_execution_time', 0);
 
-$data = forge_get_config('data_path');
-if (!is_dir($data)) {
-	system("mkdir -p $data");
-	system("chmod 0755 $data");
+$data_path = forge_get_config('data_path');
+if (!is_dir($data_path)) {
+	system("mkdir -p $data_path");
+	system("chmod 0755 $data_path");
 }
 if (!is_dir("$data/forum")) {
-	system("mkdir $data/forum");
-	system("chmod 0700 $data/forum");
+	system("mkdir $data_path/forum");
+	system("chmod 0700 $data_path/forum");
 }
 
 $fs = new ForumStorage();
@@ -110,6 +110,6 @@ while($row = db_fetch_array($res)) {
 	db_query_params('UPDATE forum_pending_attachment set filedata = $1 where attachmentid = $2', array(0, $row['attachmentid']));
 }
 
-system("chown -R ".forge_get_config('apache_user').':'.forge_get_config('apache_group')." $data/forum");
+system("chown -R ".forge_get_config('apache_user').':'.forge_get_config('apache_group')." $data_path/forum");
 
 echo "SUCCESS\n";
diff --git a/src/etc/cron.d/fusionforge-scm b/src/etc/cron.d/fusionforge-scm
index baaa8a8..332aa46 100644
--- a/src/etc/cron.d/fusionforge-scm
+++ b/src/etc/cron.d/fusionforge-scm
@@ -8,6 +8,3 @@ PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 # Generate snapshots and tarballs from SCM repositories
 0 3 * * * root forge_run_job scm/generate_scm_snapshots.php
-
-# Kill old Apache2 processes (excluding the main apache parent)
-1 * * * *	root	d=$(forge_get_config apache_service); for pid in $(pidof $d -o $(cat /var/run/$d/$d.pid)); do etimes=$(ps -oetimes -p$pid | tail -n+2); if [ ${etimes:-0} -gt 86400 ]; then kill -9 $pid; fi; done
diff --git a/src/etc/cron.d/fusionforge-web b/src/etc/cron.d/fusionforge-web
new file mode 100644
index 0000000..c02061b
--- /dev/null
+++ b/src/etc/cron.d/fusionforge-web
@@ -0,0 +1,8 @@
+#
+# Regular cron jobs for the fusionforge-web package
+#
+PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# Kill stalled Apache2 processes (excluding the main apache parent)
+# (stuck in _nss_pgsql_getpwuid_r ?)
+1 * * * *	root	d=$(forge_get_config apache_service); for pid in $(pidof $d -o $(cat /var/run/$d/$d.pid)); do etimes=$(ps -oetimes -p$pid | tail -n+2); if [ ${etimes:-0} -gt 86400 ]; then kill -9 $pid; fi; done
diff --git a/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.pl b/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.pl
index d0bde7f..672cae8 100755
--- a/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.pl
+++ b/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.pl
@@ -474,6 +474,9 @@ if ($mode eq 'commit')
     push(@body, "Date: $date\n");
     push(@body, "New Revision: $rev\n");
     push(@body, "\n");
+    push(@body, "Log:\n");
+    push(@body, @log);
+    push(@body, "\n");
     if (@adds)
       {
         @adds = sort @adds;
@@ -492,9 +495,6 @@ if ($mode eq 'commit')
         push(@body, "Modified:\n");
         push(@body, map { "   $_\n" } @mods);
       }
-    push(@body, "Log:\n");
-    push(@body, @log);
-    push(@body, "\n");
   }
 elsif ($mode eq 'revprop-change')
   {
diff --git a/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
index 4001d83..21b8686 100644
--- a/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
+++ b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
@@ -26,7 +26,7 @@ ScriptAlias /anonscm/viewvc ${FF__core__plugins_path}/scmsvn/libexec/viewvc.cgi
 # Redirect URLs from FF < 6.0 (scm_host -> scm_host)
 # Note: ViewVC URLs are backward-compatible through proxying in viewvc.php
 <IfModule mod_authz_svn.c>
-  Alias /svn ${FF__core__source_path}/www/plugins/scmsvn/redirect-to-itk.php
+  Alias /svn ${FF__core__plugins_path}/scmsvn/www/redirect-to-itk.php
 </IfModule>
 <IfModule !mod_authz_svn.c>
   Redirect permanent /svn /anonscm/svn/


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list