[Fusionforge-commits] r11272 - in trunk/src: deb-specific debian/dsf-in plugins/scmcvs/bin plugins/scmcvs/packaging/install
Christian Bayle
cbayle at libremir.placard.fr.eu.org
Fri Oct 29 22:44:46 CEST 2010
Author: cbayle
Date: 2010-10-29 22:44:44 +0200 (Fri, 29 Oct 2010)
New Revision: 11272
Added:
trunk/src/plugins/scmcvs/bin/install.sh
Removed:
trunk/src/deb-specific/install-cvs.sh
Modified:
trunk/src/debian/dsf-in/plugin-scmcvs.postinst
trunk/src/plugins/scmcvs/packaging/install/plugin-scmcvs
Log:
Make plugin install homogenous
Deleted: trunk/src/deb-specific/install-cvs.sh
===================================================================
--- trunk/src/deb-specific/install-cvs.sh 2010-10-29 18:40:41 UTC (rev 11271)
+++ trunk/src/deb-specific/install-cvs.sh 2010-10-29 20:44:44 UTC (rev 11272)
@@ -1,37 +0,0 @@
-#! /bin/sh
-#
-# Configure CVS for Sourceforge
-# Christian Bayle, Roland Mas, debian-sf (Sourceforge for Debian)
-
-set -e
-
-if [ $(id -u) != 0 ] ; then
- echo "You must be root to run this, please enter passwd"
- exec su -c "$0 $1"
-fi
-
-case "$1" in
- configure)
- echo "Modifying inetd for cvs server"
- echo "CVS usual config is changed for gforge one"
- # First, dedupe the commented lines
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/bin/cvs-pserver"
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/bin/cvs-pserver"
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/bin/cvs-pserver"
- update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
- # Then, insinuate ourselves
- update-inetd --comment-chars "#SF_WAS_HERE#" --disable cvspserver
- update-inetd --add "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/sbin/cvs-pserver"
- ;;
-
- purge)
- echo "Purging inetd for cvs server"
- # echo "You should dpkg-reconfigure cvs to use std install"
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/sbin/cvs-pserver"
- update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
- ;;
-
- *)
- echo "Usage: $0 {configure|purge}"
- exit 1
-esac
Modified: trunk/src/debian/dsf-in/plugin-scmcvs.postinst
===================================================================
--- trunk/src/debian/dsf-in/plugin-scmcvs.postinst 2010-10-29 18:40:41 UTC (rev 11271)
+++ trunk/src/debian/dsf-in/plugin-scmcvs.postinst 2010-10-29 20:44:44 UTC (rev 11272)
@@ -40,25 +40,7 @@
fi
fi
# Setup our CVS
- /usr/share/@OLDPACKAGE@/plugins/scmcvs/bin/install-cvs.sh configure
-
- # Making user group and cvs update from database
- /usr/share/@OLDPACKAGE@/plugins/scmcvs/bin/update-user-group-ssh.sh > /dev/null 2>&1
- rm -f /var/lib/@OLDPACKAGE@/dumps/*cvs*dump
-
- if [ ! -e /var/lib/@OLDPACKAGE@/chroot/cvs ] ; then
- cd /var/lib/@OLDPACKAGE@/chroot
- ln -s cvsroot cvs
- fi
-
- # logs
- chown root:@OLDPACKAGE@ /var/log/@OLDPACKAGE@/cvs
- chmod 775 /var/log/@OLDPACKAGE@/cvs
-
- # Restart some services
- [ -d /etc/ssh ] && invoke-rc.d ssh restart || true
- [ -d /etc/ssh-nonfree ] && invoke-rc.d ssh-nonfree restart || true
-
+ /usr/share/@OLDPACKAGE@/plugins/scmcvs/bin/install.sh configure
;;
abort-upgrade|abort-remove|abort-deconfigure)
Copied: trunk/src/plugins/scmcvs/bin/install.sh (from rev 11271, trunk/src/deb-specific/install-cvs.sh)
===================================================================
--- trunk/src/plugins/scmcvs/bin/install.sh (rev 0)
+++ trunk/src/plugins/scmcvs/bin/install.sh 2010-10-29 20:44:44 UTC (rev 11272)
@@ -0,0 +1,59 @@
+#! /bin/sh
+#
+# Configure CVS for Sourceforge
+# Christian Bayle, Roland Mas, debian-sf (Sourceforge for Debian)
+
+PATH=/usr/share/gforge/bin:/usr/share/fusionforge/bin:$PATH
+source_path=`forge_get_config source_path`
+log_path=`forge_get_config log_path`
+data_path=`forge_get_config data_path`
+
+set -e
+
+if [ `id -u` != 0 ] ; then
+ echo "You must be root to run this, please enter passwd"
+ exec su -c "$0 $1"
+fi
+
+case "$1" in
+ configure)
+ echo "Modifying inetd for cvs server"
+ echo "CVS usual config is changed for gforge one"
+ # First, dedupe the commented lines
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd $source_path/bin/cvs-pserver"
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd $source_path/plugins/scmcvs/bin/cvs-pserver"
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd $source_path/plugins/scmcvs/bin/cvs-pserver"
+ update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
+ # Then, insinuate ourselves
+ update-inetd --comment-chars "#SF_WAS_HERE#" --disable cvspserver
+ update-inetd --add "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd $source_path/plugins/scmcvs/sbin/cvs-pserver"
+
+ # Making user group and cvs update from database
+ $source_path/plugins/scmcvs/bin/update-user-group-ssh.sh > /dev/null 2>&1
+ rm -f $data_path/dumps/*cvs*dump
+
+ if [ ! -e $data_path/chroot/cvs ] ; then
+ cd $data_path/chroot
+ ln -s cvsroot cvs
+ fi
+
+ # logs
+ chown root:gforge $log_path/cvs
+ chmod 775 $log_path/cvs
+
+ # Restart some services
+ [ -d /etc/ssh ] && invoke-rc.d ssh restart || true
+ [ -d /etc/ssh-nonfree ] && invoke-rc.d ssh-nonfree restart || true
+ ;;
+
+ purge)
+ echo "Purging inetd for cvs server"
+ # echo "You should dpkg-reconfigure cvs to use std install"
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd $source_path/plugins/scmcvs/sbin/cvs-pserver"
+ update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
+ ;;
+
+ *)
+ echo "Usage: $0 {configure|purge}"
+ exit 1
+esac
Modified: trunk/src/plugins/scmcvs/packaging/install/plugin-scmcvs
===================================================================
--- trunk/src/plugins/scmcvs/packaging/install/plugin-scmcvs 2010-10-29 18:40:41 UTC (rev 11271)
+++ trunk/src/plugins/scmcvs/packaging/install/plugin-scmcvs 2010-10-29 20:44:44 UTC (rev 11272)
@@ -1,8 +1,7 @@
-deb-specific/install-cvs.sh usr/share/gforge/plugins/scmcvs/bin/
-deb-specific/update-user-group-ssh.sh usr/share/gforge/plugins/scmcvs/bin/
-plugins/scmcvs/bin/* usr/share/gforge/plugins/scmcvs/bin/
-plugins/scmcvs/sbin/* usr/share/gforge/plugins/scmcvs/sbin/
-plugins/scmcvs/common/* usr/share/gforge/plugins/scmcvs/common/
-plugins/scmcvs/cronjobs/* usr/share/gforge/plugins/scmcvs/cronjobs/
-plugins/scmcvs/etc/plugins/scmcvs/* etc/gforge/plugins/scmcvs/
+deb-specific/update-user-group-ssh.sh usr/share/@OLDPACKAGE@/plugins/scmcvs/bin/
+plugins/scmcvs/bin/* usr/share/@OLDPACKAGE@/plugins/scmcvs/bin/
+plugins/scmcvs/sbin/* usr/share/@OLDPACKAGE@/plugins/scmcvs/sbin/
+plugins/scmcvs/common/* usr/share/@OLDPACKAGE@/plugins/scmcvs/common/
+plugins/scmcvs/cronjobs/* usr/share/@OLDPACKAGE@/plugins/scmcvs/cronjobs/
+plugins/scmcvs/etc/plugins/scmcvs/* etc/@OLDPACKAGE@/plugins/scmcvs/
plugins/scmcvs/etc/*.ini etc/@PACKAGE@/config.ini.d/
More information about the Fusionforge-commits
mailing list