[Fusionforge-commits] FusionForge branch 6.0 updated. b96f771d945b40afa5513d3a7465d71050df26bd

Sylvain Beucler beuc-inria at fusionforge.org
Wed Apr 8 11:13:32 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, 6.0 has been updated
       via  b96f771d945b40afa5513d3a7465d71050df26bd (commit)
       via  8a54bc09863d3f1a928973168e0ec5a166010198 (commit)
      from  5069fd9c1989f01d85dcd45e38aaf258093d99e6 (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 b96f771d945b40afa5513d3a7465d71050df26bd
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Apr 8 11:12:10 2015 +0200

    Clarify fusionforge-scm purpose

diff --git a/src/debian/control.in b/src/debian/control.in
index ea74a18..8ffc6bd 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -124,7 +124,8 @@ Description: collaborative development tool - shell accounts (using PostgreSQL)
  web/FTP hosting, release management, etc. All these services are
  integrated into one web site and managed through a web interface.
  .
- This package manages SCM repositories.
+ This package contains the jobs to manage SCM repositories.
+ It should be installed on only one server in your infrastructure.
 
 
 Package: fusionforge-mta-postfix
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index ee2abfa..be304a8 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -176,7 +176,8 @@ mailing-lists, SCM repository, forums, support request helper,
 web/FTP hosting, release management, etc. All these services are
 integrated into one web site and managed through a web interface.
 
-This package manages SCM repositories.
+This package contains the jobs to manage SCM repositories.
+It should be installed on only one server in your infrastructure.
 %files scm -f scm.rpmfiles
 
 

commit 8a54bc09863d3f1a928973168e0ec5a166010198
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Apr 8 11:10:52 2015 +0200

    scm: optional dependencies are difficult to deal with because of the install order - just directly depend on xinetd

diff --git a/src/debian/plugins b/src/debian/plugins
index 2724351..4a594d5 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -1,8 +1,8 @@
 Package: fusionforge-plugin-scmgit
-Depends: git
+Depends: git, xinetd, rsync
 
 Package: fusionforge-plugin-scmsvn
-Depends: subversion, subversion-tools, viewvc, python-pycurl, openbsd-inetd | inet-superserver, update-inetd, augeas-tools, libapache2-mod-svn
+Depends: subversion, subversion-tools, viewvc, python-pycurl, xinetd, rsync, augeas-tools, libapache2-mod-svn
 
 Package: fusionforge-plugin-scmbzr
 Depends: bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy
diff --git a/src/plugins/scmgit/bin/install.sh b/src/plugins/scmgit/bin/install.sh
index 8a865aa..30249ea 100755
--- a/src/plugins/scmgit/bin/install.sh
+++ b/src/plugins/scmgit/bin/install.sh
@@ -13,10 +13,9 @@ case "$1" in
     configure)
 	scmgit_repos_path=$(forge_get_config repos_path scmgit)
 
-	echo "Modifying (x)inetd for Subversion server"
-	if [ -d /etc/xinetd.d/ ]; then
-	    if [ ! -e /etc/xinetd.d/fusionforge-plugin-scmgit ]; then
-		cat > /etc/xinetd.d/fusionforge-plugin-scmgit <<-EOF
+	echo "Modifying xinetd for Git server"
+	if [ ! -e /etc/xinetd.d/fusionforge-plugin-scmgit ]; then
+	    cat > /etc/xinetd.d/fusionforge-plugin-scmgit <<-EOF
 		service git
 		{
 		    port            = 9418
@@ -27,9 +26,8 @@ case "$1" in
 		    server_args     = daemon --inetd --export-all --base-path=$scmgit_repos_path
 		}
 		EOF
-	    fi
-	    service xinetd restart || true
 	fi
+	service xinetd restart
 
 	# rsync access
 	if ! grep -q '^use chroot' /etc/rsyncd.conf 2>/dev/null; then
diff --git a/src/plugins/scmsvn/bin/install.sh b/src/plugins/scmsvn/bin/install.sh
index f01e0c5..692a4bb 100755
--- a/src/plugins/scmsvn/bin/install.sh
+++ b/src/plugins/scmsvn/bin/install.sh
@@ -12,10 +12,9 @@ case "$1" in
 	scmsvn_repos_path=$(forge_get_config repos_path scmsvn)
 	scmsvn_serve_root=$(forge_get_config serve_root scmsvn)
 
-	echo "Modifying (x)inetd for Subversion server"
-	if [ -d /etc/xinetd.d/ ]; then
-	    if [ ! -e /etc/xinetd.d/fusionforge-plugin-scmsvn ]; then
-		cat > /etc/xinetd.d/fusionforge-plugin-scmsvn <<-EOF
+	echo "Modifying xinetd for Subversion server"
+	if [ ! -e /etc/xinetd.d/fusionforge-plugin-scmsvn ]; then
+	    cat > /etc/xinetd.d/fusionforge-plugin-scmsvn <<-EOF
 		service svn
 		{
 			port			= 3690
@@ -27,12 +26,8 @@ case "$1" in
 			server_args		= -i -r $scmsvn_serve_root
 		}
 		EOF
-	    fi
-	    service xinetd restart || true
-	elif [ -x /usr/sbin/update-inetd ]; then
-	    update-inetd --remove svn || true
-            update-inetd --add  "svn stream tcp nowait.400 scm-gforge /usr/bin/svnserve svnserve -i -r $scmsvn_serve_root"
 	fi
+	service xinetd restart
 
 	# rsync access
 	if ! grep -q '^use chroot' /etc/rsyncd.conf 2>/dev/null; then
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index 6dc7c0e..ee2abfa 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -168,7 +168,7 @@ fi
 
 %package scm
 Summary: Collaborative development tool - shell accounts (using PostgreSQL)
-Requires: %{name}-common = %{version}-%{release}, %{name}-shell = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}, %{name}-shell = %{version}-%{release}, xinetd, rsync
 %description scm
 FusionForge provides many tools to aid collaboration in a
 development project, such as bug-tracking, task management,
diff --git a/src/rpm/plugins b/src/rpm/plugins
index 4535ee2..244e1c3 100644
--- a/src/rpm/plugins
+++ b/src/rpm/plugins
@@ -1,8 +1,8 @@
 %package plugin-scmgit
-Requires: git, gitweb
+Requires: git, gitweb, xinetd, rsync
 
 %package plugin-scmsvn
-Requires: subversion, viewvc, python-pycurl, augeas
+Requires: subversion, viewvc, python-pycurl, xinetd, rsync, augeas
 
 %package plugin-scmbzr
 Requires: bzr, mod_wsgi, loggerhead

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

Summary of changes:
 src/debian/control.in             |    3 ++-
 src/debian/plugins                |    4 ++--
 src/plugins/scmgit/bin/install.sh |   10 ++++------
 src/plugins/scmsvn/bin/install.sh |   13 ++++---------
 src/rpm/fusionforge.spec.in       |    5 +++--
 src/rpm/plugins                   |    4 ++--
 6 files changed, 17 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list