[Pkg-mono-svn-commits] rev 1260 - xsp/trunk/debian

Tue, 13 Jul 2004 09:29:11 -0600

Author: pabl0-guest
Date: 2004-07-13 09:29:08 -0600 (Tue, 13 Jul 2004)
New Revision: 1260

Modified:
   xsp/trunk/debian/changelog
   xsp/trunk/debian/mono-xsp-update.conf
   xsp/trunk/debian/mono-xsp.init
   xsp/trunk/debian/mono-xsp.postinst
   xsp/trunk/debian/mono-xsp.preinst
   xsp/trunk/debian/mono-xsp.prerm
Log:
New prerelease and ew... mono-xsp pid should be /var/run/mono-xsp.pid, 
for security reasons (instead of a dir that owns www-data)


Modified: xsp/trunk/debian/changelog
===================================================================

--- xsp/trunk/debian/changelog	2004-07-13 15:13:53 UTC (rev 1259)
+++ xsp/trunk/debian/changelog	2004-07-13 15:29:08 UTC (rev 1260)
@@ -1,3 +1,9 @@
+xsp (1.0-4) unstable; urgency=low
+
+  * mono-xsp should use a SHARED_DIR, that will be /var/run/mono-xsp owned by www-data
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Tue, 13 Jul 2004 10:20:53 -0600
+	
 xsp (1.0-3) unstable; urgency=low
 
   * Now mono-xsp daemon 'chuid' the process to www-data system user

Modified: xsp/trunk/debian/mono-xsp-update.conf
===================================================================
--- xsp/trunk/debian/mono-xsp-update.conf	2004-07-13 15:13:53 UTC (rev 1259)
+++ xsp/trunk/debian/mono-xsp-update.conf	2004-07-13 15:29:08 UTC (rev 1260)
@@ -50,7 +50,7 @@
 $monoxsp_confd = "$monoxsp_dir/conf.d";
 $monoxsp_webapp = "$monoxsp_dir/debian.webapp";
 $daemon = "/etc/init.d/mono-xsp";
-$daemon_pid = "/var/run/mono-xsp/mono-xsp.pid";
+$daemon_pid = "/var/run/mono-xsp.pid";
 $applications = "";
 $default_file = "/etc/default/mono-xsp";
 

Modified: xsp/trunk/debian/mono-xsp.init
===================================================================
--- xsp/trunk/debian/mono-xsp.init	2004-07-13 15:13:53 UTC (rev 1259)
+++ xsp/trunk/debian/mono-xsp.init	2004-07-13 15:29:08 UTC (rev 1260)
@@ -26,9 +26,9 @@
 	return 1
     fi 
     
-    if [ -f /var/run/$NAME/$NAME.pid ]; then
+    if [ -f /var/run/$NAME.pid ]; then
 	# Are we really running xsp?
-	xsp_pid=`cat /var/run/$NAME/$NAME.pid`
+	xsp_pid=`cat /var/run/$NAME.pid`
 	xsp_ps=`ps -p $xsp_pid | wc -l`
 	if [ "$xsp_ps" != "1" ]; then
 	    echo "Sorry, there is already a xsp running, stop it first"
@@ -40,9 +40,9 @@
 }
 
 should_stop() {
-    if [ -f /var/run/$NAME/$NAME.pid ]; then
+    if [ -f /var/run/$NAME.pid ]; then
 	# Are we really running xsp?
-	xsp_pid=`cat /var/run/$NAME/$NAME.pid`
+	xsp_pid=`cat /var/run/$NAME.pid`
 	xsp_ps=`ps -p $xsp_pid | wc -l`
 	# Are there any process running by that pid?
 	if [ "$xsp_ps" = "2" ]; then
@@ -62,7 +62,7 @@
 	    echo -n "Starting $DESC: $NAME"
 	    export MONO_SHARED_DIR
 	    start-stop-daemon --start --background --make-pidfile \
-		--quiet --pidfile /var/run/$NAME/$NAME.pid \
+		--quiet --pidfile /var/run/$NAME.pid \
 		--user $user --group $group --chuid $user \
 		--exec $DAEMON -- \
 		--port $port --appconfigdir $CFGDIR --nonstop
@@ -72,7 +72,7 @@
     stop)
 	if should_stop ; then
 	    echo -n "Stopping $DESC: $NAME "
-	    start-stop-daemon --stop --quiet --pidfile /var/run/$NAME/$NAME.pid
+	    start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
 	    echo "."
 	fi
 	;;
@@ -85,7 +85,7 @@
 	
 	if should_stop ; then
 	    echo "Restarting $DESC: $NAME"	
-	    start-stop-daemon --stop --quiet --pidfile /var/run/$NAME/$NAME.pid
+	    start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
 	    sleep 1
 	fi
 	
@@ -94,7 +94,7 @@
 	    echo "Starting $DESC: $NAME"
 	    export MONO_SHARED_DIR
 	    start-stop-daemon --start --background --make-pidfile \
-		--quiet --pidfile /var/run/$NAME/$NAME.pid \
+		--quiet --pidfile /var/run/$NAME.pid \
 		--user $user --group $group --chuid $user \
 		--exec $DAEMON -- \
 		--port $port --appconfigdir $CFGDIR --nonstop

Modified: xsp/trunk/debian/mono-xsp.postinst
===================================================================
--- xsp/trunk/debian/mono-xsp.postinst	2004-07-13 15:13:53 UTC (rev 1259)
+++ xsp/trunk/debian/mono-xsp.postinst	2004-07-13 15:29:08 UTC (rev 1260)
@@ -50,9 +50,9 @@
 	return 1
     fi 
     
-    if [ -f /var/run/$NAME/$NAME.pid ]; then
+    if [ -f /var/run/$NAME.pid ]; then
 	# Are we really running xsp?
-	xsp_pid=`cat /var/run/$NAME/$NAME.pid`
+	xsp_pid=`cat /var/run/$NAME.pid`
 	xsp_ps=`ps -p $xsp_pid | wc -l`
 	if [ "$xsp_ps" != "2" ]; then
 	    return 0

Modified: xsp/trunk/debian/mono-xsp.preinst
===================================================================
--- xsp/trunk/debian/mono-xsp.preinst	2004-07-13 15:13:53 UTC (rev 1259)
+++ xsp/trunk/debian/mono-xsp.preinst	2004-07-13 15:29:08 UTC (rev 1260)
@@ -4,9 +4,9 @@
 DESC="XSP WebServer"
 
 should_stop() {
-    if [ -f /var/run/$NAME/$NAME.pid ]; then
+    if [ -f /var/run/$NAME.pid ]; then
         # Are we really running xsp?
-	xsp_pid=`cat /var/run/$NAME/$NAME.pid`
+	xsp_pid=`cat /var/run/$NAME.pid`
 	xsp_ps=`ps -p $xsp_pid | wc -l`
 	# Are there any process running by that pid?
 	if [ "$xsp_ps" = "2" ]; then

Modified: xsp/trunk/debian/mono-xsp.prerm
===================================================================
--- xsp/trunk/debian/mono-xsp.prerm	2004-07-13 15:13:53 UTC (rev 1259)
+++ xsp/trunk/debian/mono-xsp.prerm	2004-07-13 15:29:08 UTC (rev 1260)
@@ -6,9 +6,9 @@
 #0 : false
 #1 : true
 should_stop() {
-    if [ -f /var/run/$NAME/$NAME.pid ]; then
+    if [ -f /var/run/$NAME.pid ]; then
 	# Are we really running xsp?
-	xsp_pid=`cat /var/run/$NAME/$NAME.pid`
+	xsp_pid=`cat /var/run/$NAME.pid`
 	xsp_ps=`ps -p $xsp_pid | wc -l`
 	# Are there any process running by that pid?
 	if [ "$xsp_ps" = "2" ]; then



