[Fusionforge-commits] FusionForge branch master updated. 9beeffc48b3140d6f1f658bed196d9d47540033c

Sylvain Beucler beuc-inria at fusionforge.org
Wed Sep 10 14:54:13 CEST 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, master has been updated
       via  9beeffc48b3140d6f1f658bed196d9d47540033c (commit)
       via  fc7d454a3d3a0332879c18645362a94e563c2dac (commit)
      from  b2bbc43c825a7ede9e8acc3f91ec54637b29d423 (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 9beeffc48b3140d6f1f658bed196d9d47540033c
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Sep 10 14:45:48 2014 +0200

    shell: configure collaborative umask

diff --git a/src/debian/control.in b/src/debian/control.in
index 6cb5098..e0cc236 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -102,7 +102,7 @@ Description: collaborative development tool - web vhosts (using Apache)
 
 Package: fusionforge-shell
 Architecture: all
-Depends: fusionforge-common (=${source:Version}), php5-cli, libnss-pgsql2, openssh-server, unscd | nscd, ucf, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), php5-cli, libnss-pgsql2, openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends}
 Description: collaborative development tool - shell accounts (using PostgreSQL)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
diff --git a/src/post-install.d/shell/shell.sh b/src/post-install.d/shell/shell.sh
index 19bcf2b..00f4a64 100755
--- a/src/post-install.d/shell/shell.sh
+++ b/src/post-install.d/shell/shell.sh
@@ -79,6 +79,17 @@ purge_libnss_pgsql(){
     rm -f /etc/nss-pgsql.conf /etc/nss-pgsql-root.conf
 }
 
+configure_pam() {
+    # Collaborative umask 0022 -> 0002
+    if ! grep -q '^session\s*optional\s*pam_umask.so.*' /etc/pam.d/sshd; then
+	echo 'session    optional     pam_umask.so umask=002  # FusionForge' >> /etc/pam.d/sshd
+    fi
+}
+
+remove_pam() {
+    sed -i -e '/.* # FusionForge/d' /etc/pam.d/sshd
+}
+
 # Modify /etc/nsswitch.conf
 # Not using UCF since we're sed-ing an existing file
 configure_nsswitch()
@@ -115,9 +126,11 @@ case "$1" in
 	configure_libnss_pgsql
 	configure_nsswitch
 	configure_nscd
+	configure_pam
 	;;
     remove)
 	remove_nsswitch
+	remove_pam
 	;;
     purge)
 	# note: can't be called from Debian's postrm - rely on ucfq(1)
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index 936c41e..c5e5176 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -129,7 +129,7 @@ installs (e.g. plugins activation requires a populated db).
 
 %package shell
 Summary: collaborative development tool - shell accounts (using PostgreSQL)
-Requires: %{name}-common = %{version}, php, openssh-server nscd libnss-pgsql
+Requires: %{name}-common = %{version}, php, openssh-server, nscd, libnss-pgsql, pam
 %description shell
 FusionForge provides many tools to aid collaboration in a
 development project, such as bug-tracking, task management,

commit fc7d454a3d3a0332879c18645362a94e563c2dac
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Sep 10 14:35:55 2014 +0200

    scmsvn: work-around memory leak in mod_dav_svn

diff --git a/src/debian/plugins b/src/debian/plugins
index 367a7e6..fd4246f 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -2,7 +2,7 @@ Package: fusionforge-plugin-scmgit
 Depends: git, gitweb
 
 Package: fusionforge-plugin-scmsvn
-Depends: subversion, subversion-tools, viewvc, openbsd-inetd | inet-superserver, update-inetd
+Depends: subversion, subversion-tools, viewvc, openbsd-inetd | inet-superserver, update-inetd, augeas-tools
 
 Package: fusionforge-plugin-scmbzr
 Depends: bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy
diff --git a/src/plugins/scmsvn/bin/install.sh b/src/plugins/scmsvn/bin/install.sh
index eb99a4d..83e5f54 100755
--- a/src/plugins/scmsvn/bin/install.sh
+++ b/src/plugins/scmsvn/bin/install.sh
@@ -18,6 +18,17 @@ case "$1" in
 	else
 	    echo "TODO: xinetd support"
 	fi
+
+	# Work-around memory leak in mod_dav_svn
+	for conf in /etc/apache2/apache2.conf /etc/httpd/conf/httpd.conf \
+	    /etc/apache2/server-tuning.conf; do
+	    if [ -e $conf ] && type augtool >/dev/null 2>&1; then
+		val=$(augtool "print /files$conf/IfModule[arg='mpm_worker_module' or arg='worker.c']/directive[.='MaxRequestsPerChild']/arg" | sed 's/^.*= "\(.*\)"/\1/')
+		if [ "$val" = "0" ]; then
+		    augtool --autosave "set /files$conf/IfModule[arg='mpm_worker_module' or arg='worker.c']/directive[.='MaxRequestsPerChild']/arg 5000"
+		fi
+	    fi
+	done
 	;;
 
     remove)
diff --git a/src/rpm/plugins b/src/rpm/plugins
index 5af0034..f599e8c 100644
--- a/src/rpm/plugins
+++ b/src/rpm/plugins
@@ -2,7 +2,7 @@
 Requires: git, gitweb
 
 %package plugin-scmsvn
-Requires: subversion, viewvc
+Requires: subversion, viewvc, augeas
 
 %package plugin-scmbzr
 Requires: bazaar, mod_wsgi, loggerhead

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

Summary of changes:
 src/debian/control.in             |    2 +-
 src/debian/plugins                |    2 +-
 src/plugins/scmsvn/bin/install.sh |   11 +++++++++++
 src/post-install.d/shell/shell.sh |   13 +++++++++++++
 src/rpm/fusionforge.spec.in       |    2 +-
 src/rpm/plugins                   |    2 +-
 6 files changed, 28 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list