[Pkg-mono-svn-commits] rev 525 - monodoc/trunk/debian

Pablo Fischer pabl0-guest@haydn.debian.org
Fri, 09 Apr 2004 16:48:35 -0600


Author: pabl0-guest
Date: 2004-04-09 16:48:33 -0600 (Fri, 09 Apr 2004)
New Revision: 525

Added:
   monodoc/trunk/debian/monodoc-http.prerm
Modified:
   monodoc/trunk/debian/monodoc-http.postinst
   monodoc/trunk/debian/monodoc-http.postrm
Log:
Updated. The way that monodoc-http is 'added' to mono-server or mono-xsp 
is now different.

Also, the removal script is now: prerm.




Modified: monodoc/trunk/debian/monodoc-http.postinst
===================================================================
--- monodoc/trunk/debian/monodoc-http.postinst	2004-04-09 20:07:13 UTC (rev 524)
+++ monodoc/trunk/debian/monodoc-http.postinst	2004-04-09 22:48:33 UTC (rev 525)
@@ -2,20 +2,54 @@
 
 if test -x /usr/bin/update-menus; then update-menus; fi
 
+monodoc_xspconfd="/etc/xsp/conf.d/monodoc"
+monodoc_xspconffile="$monodoc_xspconfd/10_monodoc"
+
+monodoc_monoserverconfd="/etc/mono-server/conf.d/monodoc"
+monodoc_monoserverconffile="$monodoc_monoserverconfd/10_monodoc"
+
+monoserver_default="/etc/default/mono-server"
+monoxsp_default="/etc/default/mono-xsp"
+
+restart_firsttime() {    
+    confd="$1"
+    daemon="$2"
+    desc="$3"
+    almost_empty="`ls -lA $confd | wc -l`"
+    if [ "$almost_empty" = "2" ] ; then
+	echo "Starting $desc: $daemon"
+	/etc/init.d/$daemon start > /dev/null 2>&1 || true		
+    fi    
+}
+
+
 restart_xsp() {
+    #Ok, include the default file
+    . $monoxsp_default
     #XSP is running?
     if [ -f /var/run/mono-xsp ]; then
         # Are we really running xsp?
 	xsp_pid=`cat /var/run/mono-xsp`
 	xsp_ps=`ps -p $xsp_pid | wc -l`
- 	# Are there any process running by that pid?
+ 	# Are there any process running by that pid	
 	if [ "$xsp_ps" != "1" ]; then
-	    /etc/init.d/mono-xsp restart
+	    if [ "$start_boot" = "true" ]; then
+		echo "Restarting XSP WebServer: mono-xsp"
+		/etc/init.d/mono-xsp restart > /dev/null 2>&1 || true
+	    fi
+	else
+	    restart_firsttime "/etc/xsp/conf.d" "mono-xsp" "XSP WebServer"
 	fi
+    else
+	if [ "$start_boot" = "true" ]; then
+	    restart_firsttime "/etc/xsp/conf.d" "mono-xsp" "XSP WebServer"
+	fi
     fi
 }
 
 restart_monoserver() {
+    #Ok, include the default file
+    . $monoserver_default
     #MonoServer is running?
     if [ -f /var/run/mono-server ]; then
         # Are we really running xsp?
@@ -23,29 +57,55 @@
 	monoserver_ps=`ps -p $monoserver_pid | wc -l`
  	# Are there any process running by that pid?
 	if [ "$xsp_ps" != "1" ]; then
-	    /etc/init.d/mono-server restart
+	    if [ "$start_boot" = "true" ]; then
+		echo "Restarting Mono Server: mod-mono-server"
+		/etc/init.d/mono-server restart > /dev/null 2>&1 || true
+	    fi
+	else
+	    restart_firsttime "/etc/mono-server/conf.d" "mono-server" "Mono Server"
 	fi
+    else
+	if [ "$start_boot" = "true" ]; then
+	    restart_firsttime "/etc/mono-server/conf.d" "mono-server" "Mono Server"
+	fi
     fi
+	
+
 }
 
-case "$1" in
-   configure)
 
-   if [ -x "`which mono-xsp-update.conf`" 2>/dev/null -a -d /etc/xsp ]; then
-      restart_xsp
-   fi
-   if [ -x /usr/share/dotnet/bin/mod-mono-server.exe -a -d /etc/mono-server ]; then
-      restart_monoserver
-   fi
+make_conffile() {
+    echo "# This is the configuration file"
+    echo "# for the monodoc virtualhost"
+    echo "path = /usr/share/dotnet/monodoc/web"
+    echo "alias = /monodoc"
+}
 
-   ;;
 
-   abort-upgrade|abort-remove|abort-deconfigure)
-   #Do nothing..
-   ;;
+case "$1" in
+    configure)
+	if [ -x "`which mono-xsp-update.conf`" 2>/dev/null -a -d /etc/xsp ]; then
+	    mkdir -p $monodoc_xspconfd
+	    make_conffile > "$monodoc_xspconffile"		
+	    mono-xsp-update.conf
+	    restart_xsp
+	fi
+	if [ -x "`which /usr/share/dotnet/bin/mod-mono-server.exe`" 2>/dev/null -a -d /etc/mono-server ]; then
+	    mkdir -p $monodoc_monoserverconfd
+	    make_conffile > "$monodoc_monoserverconffile"		
+	    mono-server-update.conf
+	    restart_monoserver
+	fi
+	;;
+    
+    abort-upgrade|abort-remove|abort-deconfigure)
+        #Do nothing..
+    ;;
 
     *)
 	;;
 esac
 
 exit 0
+
+

Modified: monodoc/trunk/debian/monodoc-http.postrm
===================================================================
--- monodoc/trunk/debian/monodoc-http.postrm	2004-04-09 20:07:13 UTC (rev 524)
+++ monodoc/trunk/debian/monodoc-http.postrm	2004-04-09 22:48:33 UTC (rev 525)
@@ -2,60 +2,5 @@
 
 if test -x /usr/bin/update-menus; then update-menus; fi
 
-monodochttp_xspconfd="/etc/xsp/conf.d/monodoc"
-monodochttp_monoserverconfd="/etc/mono-server/conf.d/monodoc"
-
-restart_xsp() {
-    #XSP is running?
-    if [ -f /var/run/mono-xsp ]; then
-        # Are we really running xsp?
-	xsp_pid=`cat /var/run/mono-xsp`
-	xsp_ps=`ps -p $xsp_pid | wc -l`
- 	# Are there any process running by that pid?
-	if [ "$xsp_ps" != "1" ]; then
-	    /etc/init.d/mono-xsp restart
-	fi
-    fi
-}
-
-restart_monoserver() {
-    #MonoServer is running?
-    if [ -f /var/run/mono-server ]; then
-        # Are we really running xsp?
-	monoserver_pid=`cat /var/run/mono-server`
-	monoserver_ps=`ps -p $monoserver_pid | wc -l`
- 	# Are there any process running by that pid?
-	if [ "$xsp_ps" != "1" ]; then
-	    /etc/init.d/mono-server restart
-	fi
-    fi
-}
-
-case "$1" in
-    remove)
-	if [ -x /usr/share/dotnet/bin/xsp.exe -a -d /etc/xsp ]; then
-            #We should remove everything... 
-	    rm -Rf $monodochttp_xspconfd
-	    mono-xsp-update.conf
-	    #Restart XSP
-	    restart_xsp
-	fi
-
-	if [ -x /usr/share/dotnet/bin/mod-mono-server.exe -a -d /etc/mono-server ]; then
-	    rm -Rf $monodochttp_monoserverconfd
-	    mono-server-update.conf
-	    #Restart mono-server
-	    restart_monoserver
-	fi
-	;;
-    
-    abort-upgrade|abort-remove|abort-deconfigure)
-        #Do nothing..
-    ;;
-
-    *)
-	;;
-esac
-
 exit 0
 

Added: monodoc/trunk/debian/monodoc-http.prerm
===================================================================
--- monodoc/trunk/debian/monodoc-http.prerm	2004-04-09 20:07:13 UTC (rev 524)
+++ monodoc/trunk/debian/monodoc-http.prerm	2004-04-09 22:48:33 UTC (rev 525)
@@ -0,0 +1,68 @@
+#!/bin/sh -e
+
+monodoc_xspconfd="/etc/xsp/conf.d/monodoc"
+monodoc_monoserverconfd="/etc/mono-server/conf.d/monodoc"
+
+monoserver_default="/etc/default/mono-server"
+monoxsp_default="/etc/default/mono-xsp"
+
+restart_xsp() {
+    #XSP is running?
+    if [ -f /var/run/mono-xsp ]; then
+        # Are we really running xsp?
+	xsp_pid=`cat /var/run/mono-xsp`
+	xsp_ps=`ps -p $xsp_pid | wc -l`
+ 	# Are there any process running by that pid?
+	if [ "$xsp_ps" != "1" ]; then
+	    #Include default
+	    . $monoxsp_default
+	    if [ "$start_boot" = "true" ]; then
+		echo "Restarting XSP WebServer: mono-xsp"
+		/etc/init.d/mono-xsp restart > /dev/null 2>&1 || true
+	    fi
+	fi
+    fi
+}
+
+restart_monoserver() {
+    #MonoServer is running?
+    if [ -f /var/run/mono-server ]; then
+        # Are we really running xsp?
+	monoserver_pid=`cat /var/run/mono-server`
+	monoserver_ps=`ps -p $monoserver_pid | wc -l`
+ 	# Are there any process running by that pid?
+	if [ "$xsp_ps" != "1" ]; then
+	    #Include default (monoserver)
+	    . $monoserver_default
+	    if [ "$start_boot" = "true" ]; then
+		echo "Restarting Mono Server: mod-mono-server"
+		/etc/init.d/mono-server restart > /dev/null 2>&1 || true
+	    fi
+	fi
+    fi
+}
+
+case "$1" in
+    remove)
+	if [ -x "`which mono-xsp-update.conf`" 2>/dev/null -a -d /etc/xsp ]; then
+	    rm -Rf $monodoc_xspconfd
+	    mono-xsp-update.conf
+	    restart_xsp
+	fi
+	if [ -x "`which /usr/share/dotnet/bin/mod-mono-server.exe`" 2>/dev/null -a -d /etc/mono-server ]; then
+	    rm -Rf $monodoc_monoserverconfd
+	    mono-server-update.conf
+	    restart_monoserver
+	fi
+	;;
+    
+    abort-upgrade|abort-remove|abort-deconfigure)
+        #Do nothing..
+    ;;
+
+    *)
+	;;
+esac
+
+exit 0
+