You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2012/03/07 02:19:14 UTC
svn commit: r1297823 - in
/subversion/trunk/tools/server-side/svnpubsub/rc.d: svnwcsub
svnwcsub.debian svnwcsub.solaris
Author: gstein
Date: Wed Mar 7 01:19:13 2012
New Revision: 1297823
URL: http://svn.apache.org/viewvc?rev=1297823&view=rev
Log:
Adjust the rc.d scripts to invoke svnwcsub.py directly (rather than
via the twistd daemon), and to request daemon mode.
* tools/server-side/svnpubsub/rc.d/svnwcsub.solaris:
* tools/server-side/svnpubsub/rc.d/svnwcsub:
* tools/server-side/svnpubsub/rc.d/svnwcsub.debian:
(...): adjust invocation and add --daemon
Modified:
subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub
subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
Modified: subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub?rev=1297823&r1=1297822&r2=1297823&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub (original)
+++ subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub Wed Mar 7 01:19:13 2012
@@ -18,22 +18,19 @@ load_rc_config $name
svnwcsub_enable=${svnwcsub_enable-"NO"}
svnwcsub_user=${svnwcsub_user-"svnwc"}
svnwcsub_group=${svnwcsub_group-"svnwc"}
-svnwcsub_reactor=${svnwcsub_reactor-"poll"}
svnwcsub_pidfile=${svnwcsub_pidfile-"/var/run/svnwcsub/svnwcsub.pub"}
-svnwcsub_program=${svnwcsub_program-"/usr/local/bin/twistd"}
svnwcsub_env="PYTHON_EGG_CACHE"
svnwcsub_cmd_int=${svnwcsub_cmd_int-"python"}
pidfile="${svnwcsub_pidfile}"
export PYTHON_EGG_CACHE="/var/run/svnwcsub"
-command="/usr/local/bin/twistd"
+command="/usr/local/svnpubsub/svnwcsub.py"
command_interpreter="/usr/local/bin/${svnwcsub_cmd_int}"
-command_args="-y /usr/local/svnpubsub/svnwcsub.tac \
- --logfile=/var/log/svnwcsub.log \
- --pidfile=${pidfile} \
- --uid=${svnwcsub_user} --gid=${svnwcsub_group} \
- --umask=002 -r${svnwcsub_reactor}"
+command_args="--daemon \
+ --logfile=/var/log/svnwcsub.log \
+ --pidfile=${pidfile} \
+ --uid=${svnwcsub_user} --gid=${svnwcsub_group} \
+ --umask=002"
run_rc_command "$1"
-
Modified: subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian?rev=1297823&r1=1297822&r2=1297823&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian (original)
+++ subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.debian Wed Mar 7 01:19:13 2012
@@ -14,21 +14,20 @@
svnwcsub_user=${svnwcsub_user-"svnwc"}
svnwcsub_group=${svnwcsub_group-"svnwc"}
-svnwcsub_reactor=${svnwcsub_reactor-"poll"}
svnwcsub_pidfile=${svnwcsub_pidfile-"/var/run/svnwcsub.pid"}
pidfile="${svnwcsub_pidfile}"
-TWSITD_CMD="/usr/bin/twistd -y /opt/svnpubsub/svnwcsub.tac \
- --logfile=/var/bwlog/svnpubsub/svnwcsub.log \
- --pidfile=${pidfile} \
- --uid=${svnwcsub_user} --gid=${svnwcsub_group} \
- -r${svnwcsub_reactor}"
+SVNWCSUB_CMD="/opt/svnpubsub/svnwcsub.py \
+ --daemon \
+ --logfile=/var/bwlog/svnpubsub/svnwcsub.log \
+ --pidfile=${pidfile} \
+ --uid=${svnwcsub_user} --gid=${svnwcsub_group}"
RETVAL=0
start() {
echo "Starting SvnWcSub Server: "
- $TWSITD_CMD
+ $SVNWCSUB_CMD
RETVAL=$?
[ $RETVAL -eq 0 ] && echo "ok" || echo "failed"
return $RETVAL
Modified: subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris?rev=1297823&r1=1297822&r2=1297823&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris (original)
+++ subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris Wed Mar 7 01:19:13 2012
@@ -5,22 +5,21 @@
svnwcsub_user=${svnwcsub_user-"svnwc"}
svnwcsub_group=${svnwcsub_group-"other"}
-svnwcsub_reactor=${svnwcsub_reactor-"poll"}
svnwcsub_pidfile=${svnwcsub_pidfile-"/var/run/svnwcsub/svnwcsub.pid"}
pidfile="${svnwcsub_pidfile}"
-TWSITD_CMD="/opt/python/2.6.2/bin/twistd -y /usr/local/svnpubsub/svnwcsub.tac \
- --logfile=/x1/log/svnwcsub.log \
- --pidfile=${pidfile} \
- --umask=002 \
- --uid=${svnwcsub_user} --gid=${svnwcsub_group} \
- -r${svnwcsub_reactor}"
+SVNWCSUB_CMD="/usr/local/svnpubsub/svnwcsub.py \
+ --daemon \
+ --logfile=/x1/log/svnwcsub.log \
+ --pidfile=${pidfile} \
+ --umask=002 \
+ --uid=${svnwcsub_user} --gid=${svnwcsub_group}"
RETVAL=0
start() {
echo "Starting SvnWcSub Server: "
- $TWSITD_CMD
+ $SVNWCSUB_CMD
RETVAL=$?
[ $RETVAL -eq 0 ] && echo "ok" || echo "failed"
return $RETVAL