[Pkg-mono-svn-commits] rev 759 - xsp/trunk/debian
Pablo Fischer
pabl0-guest@haydn.debian.org
Thu, 20 May 2004 16:37:40 -0600
Author: pabl0-guest
Date: 2004-05-20 16:37:37 -0600 (Thu, 20 May 2004)
New Revision: 759
Added:
xsp/trunk/debian/mono-server_init.old
xsp/trunk/debian/mono-server_preinst.old
Removed:
xsp/trunk/debian/mono-server.init
xsp/trunk/debian/mono-server.preinst
Modified:
xsp/trunk/debian/mono-server.config
xsp/trunk/debian/mono-server.postinst
xsp/trunk/debian/mono-server.postrm
xsp/trunk/debian/mono-server.prerm
xsp/trunk/debian/mono-server.templates
Log:
Removed some scripts of the previous mono-server, the new one depends totally of
apache, so we don't need to care to start mono-server, just apache, and
mono-server-update.conf will care of it.
Modified: xsp/trunk/debian/mono-server.config
===================================================================
--- xsp/trunk/debian/mono-server.config 2004-05-20 22:25:36 UTC (rev 758)
+++ xsp/trunk/debian/mono-server.config 2004-05-20 22:37:37 UTC (rev 759)
@@ -9,13 +9,13 @@
while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
case "$STATE" in
1)
- db_input medium monoserver/monoserver_autostart || true
+ db_input medium monoserver/monoserver_addmodule || true
if db_go; then
- db_get monoserver/monoserver_autostart || true
+ db_get monoserver/monoserver_addmodule || true
if [ "$RET" = "true" ]; then
STATE=2
else
- db_set monoserver/monoserver_autostart false || true
+ db_set monoserver/monoserver_addmodule false || true
STATE=2
fi
else
Deleted: xsp/trunk/debian/mono-server.init
===================================================================
--- xsp/trunk/debian/mono-server.init 2004-05-20 22:25:36 UTC (rev 758)
+++ xsp/trunk/debian/mono-server.init 2004-05-20 22:37:37 UTC (rev 759)
@@ -1,145 +0,0 @@
-#! /bin/sh
-#
-# mono-server Start the mono-server, the mod-mono-server one
-#
-# Written by Pablo Fischer <pablo@pablo.com.mx>
-# Modified for Debian GNU/Linux
-#
-# Version: @(#)mono-server pablo@pablo.com.mx
-#
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/mod-mono-server
-NAME=mono-server
-DESC="Mono Server, mod-mono-server"
-DEFAULT=/etc/default/$NAME
-CFGDIR=/etc/$NAME
-VIRTUALFILE=$CFGDIR/mono-server-hosts.conf
-
-test -x $DAEMON || exit 0
-
-virtual_dirs=`mono-server-reader.conf --norestart`
-
-prepare_socket() {
- . $DEFAULT
- if [ ! -d /tmp/.mono-server ]; then
- mkdir /tmp/.mono-server
- fi
-
- if [ -e $socket_file ]; then
- rm -Rf $socket_file
- fi
-}
-
-fix_privileges() {
- . $DEFAULT
- chown $user.$group $socket_file
-}
-
-should_start() {
- if [ -e $DEFAULT ]; then
- . $DEFAULT
- if [ "$start_boot" != "true" ]; then
- echo "$NAME not started as requested"
- return 1
- fi
- fi
-
- if [ ! -f /usr/lib/apache/1.3/500mod_mono.info ]; then
- echo "There's no need to start me if you don't have libapache-mod-mono, sorry!"
- return 1
- fi
-
- if [ ! -x $DAEMON ]; then
- echo "$NAME is not executable, not starting"
- return 1
- fi
-
- if [ ! -e $VIRTUALFILE ]; then
- echo "You dont have $VIRTUALFILE "
- echo "To have it, you need to install at least one package for xsp (like asp.net-examples)"
- return 1
- fi
-
- if [[ -z $virtual_dirs ]]; then
- echo "Sorry, I found an empty /etc/mono-server/mono-server-hosts.conf"
- return 1
- fi
-
- if [[ $virtual_dirs = *Sorry* ]]; then
- echo "Sorry, I found a missconfiguration in /etc/mono-server/mono-server-hosts.conf, fix it, or dpkg-reconfigure mono-server/virtua\lhosts packages"
- return 1
- fi
-
- prepare_socket
- return 0
-}
-
-
-should_stop() {
- if [ -f /var/run/$NAME ]; then
- # Are we really running monoserver?
- monoserver_pid=`cat /var/run/$NAME`
- monoserver_ps=`ps -p $monoserver_pid | wc -l`
- # Are there any process running by that pid?
- if [ "$monoserver_ps" = "2" ]; then
- return 0
- else
- return 1
- fi
- else
- return 0
- fi
-}
-
-case "$1" in
- start)
- if should_start ; then
- . $DEFAULT
- echo -n "Starting $DESC: $NAME"
- start-stop-daemon --start --background --make-pidfile \
- --quiet --pidfile /var/run/$NAME \
- --exec $DAEMON -- --applications $virtual_dirs --filename $socket_file --nonstop
- echo "."
- sleep 2
- fix_privileges
- fi
- ;;
- stop)
- if should_stop ; then
- echo -n "Stopping $DESC: $NAME "
- start-stop-daemon --stop --quiet --pidfile /var/run/$NAME
- echo "."
- fi
- ;;
- restart|force-reload)
- #
- # If the "reload" option is implemented, move the "force-reload"
- # option to the "reload" entry above. If not, "force-reload" is
- # just the same as "restart".
- #
- if should_stop ; then
- echo "Restarting $DESC: $NAME"
- start-stop-daemon --stop --quiet --pidfile /var/run/$NAME
- sleep 1
- fi
-
- if should_start ; then
- . $DEFAULT
- start-stop-daemon --start --background --make-pidfile \
- --quiet --pidfile /var/run/$NAME \
- --exec $DAEMON -- --applications $virtual_dirs --filename $socket_file --nonstop
- echo "."
- sleep 2
- fix_privileges
- fi
- ;;
- *)
- N=/etc/init.d/$NAME
- # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Modified: xsp/trunk/debian/mono-server.postinst
===================================================================
--- xsp/trunk/debian/mono-server.postinst 2004-05-20 22:25:36 UTC (rev 758)
+++ xsp/trunk/debian/mono-server.postinst 2004-05-20 22:37:37 UTC (rev 759)
@@ -5,73 +5,25 @@
. /usr/share/debconf/confmodule
db_version 2.0
-tempfile=`/bin/tempfile`
-modmono_default="/etc/default/mono-server"
-NAME=mono-server
-DESC="Mono Server, mono-server"
-CFGDIR=/etc/$NAME
-VIRTUALFILE=$CFGDIR/mono-server-hosts.conf
-virtual_dirs=`mono-server-reader.conf`
-
-
-activate_monoserver() {
- sed s/start_boot=false/start_boot=true/g $modmono_default > $tempfile
- cp -f $tempfile $modmono_default
- rm -Rf $tempfile
-
+add_module() {
+
}
-deactivate_monoserver() {
- sed s/start_boot=true/start_boot=false/g $modmono_default > $tempfile
- cp -f $tempfile $modmono_default
- rm -Rf $tempfile
-}
+remove_module() {
-
-should_start() {
- if [ -e $modmono_default ]; then
- . $modmono_default
- if [ "$start_boot" != "true" ]; then
- return 1
- fi
- fi
-
- if [ ! -f /usr/lib/apache/1.3/500mod_mono.info ]; then
- return 1
- fi
-
- if [ ! -e $VIRTUALFILE ]; then
- return 1
- fi
-
- if [[ $virtual_dirs = *Sorry* ]]; then
- return 1
- fi
-
- if [[ -z $virtual_dirs ]]; then
- return 1
- fi
- return 0
-
}
case "$1" in
configure)
- db_get monoserver/monoserver_autostart || true
+ db_get monoserver/monoserver_addmodule || true
if [ "$RET" = "true" ]; then
- activate_monoserver
- if [ -x "/etc/init.d/mono-server" ]; then
- update-rc.d mono-server defaults >/dev/null
- fi
+ add_module
else
- deactivate_monoserver
+ remove_module
fi
+
mono-server-update.conf
- if should_start ; then
- echo -n "Starting $DESC: $NAME "
- /etc/init.d/mono-server start > /dev/null 2>&1 || true
- fi
;;
*)
Modified: xsp/trunk/debian/mono-server.postrm
===================================================================
--- xsp/trunk/debian/mono-server.postrm 2004-05-20 22:25:36 UTC (rev 758)
+++ xsp/trunk/debian/mono-server.postrm 2004-05-20 22:37:37 UTC (rev 759)
@@ -7,8 +7,6 @@
rm -Rf "$monoserverconfd/*"
. /usr/share/debconf/confmodule
db_purge
- #update-rc.d
- update-rc.d -f mono-server remove >/dev/null
;;
esac
exit 0
Deleted: xsp/trunk/debian/mono-server.preinst
===================================================================
--- xsp/trunk/debian/mono-server.preinst 2004-05-20 22:25:36 UTC (rev 758)
+++ xsp/trunk/debian/mono-server.preinst 2004-05-20 22:37:37 UTC (rev 759)
@@ -1,31 +0,0 @@
-#!/bin/sh -e
-
-NAME=mono-server
-DESC="Mono Server, mod-mono-server"
-
-#0 : false
-#1 : true
-should_stop() {
- if [ -f /var/run/$NAME ]; then
- # Are we really running monoserver?
- monoserver_pid=`cat /var/run/$NAME`
- monoserver_ps=`ps -p $monoserver_pid | wc -l`
- # Are there any process running by that pid?
- if [ "$monoserver_ps" = "2" ]; then
- return 0
- else
- return 1
- fi
- fi
- return 0
-}
-
-case "$1" in
- upgrade|install)
- if should_stop ; then
- echo -n "Stopping $DESC: $NAME "
- /etc/init.d/mono-server stop > /dev/null 2>&1 || true
- fi
- ;;
-esac
-exit 0
Modified: xsp/trunk/debian/mono-server.prerm
===================================================================
--- xsp/trunk/debian/mono-server.prerm 2004-05-20 22:25:36 UTC (rev 758)
+++ xsp/trunk/debian/mono-server.prerm 2004-05-20 22:37:37 UTC (rev 759)
@@ -1,32 +1,12 @@
#!/bin/sh -e
-NAME=mono-server
-DESC="Mono Server, mono-server"
+remove_module() {
-monoserverconfd="/etc/mono-server/conf.d/"
-
-should_stop() {
- if [ -f /var/run/$NAME ]; then
- # Are we really running monoserver?
- monoserver_pid=`cat /var/run/$NAME`
- monoserver_ps=`ps -p $monoserver_pid | wc -l`
- # Are there any process running by that pid?
- if [ "$monoserver_ps" = "2" ]; then
- return 0
- else
- return 1
- fi
- fi
- return 0
}
case "$1" in
remove)
- # should we stop the server?
- if should_stop ; then
- echo "Stopping $DESC: $NAME "
- /etc/init.d/mono-server stop > /dev/null 2>&1 || true
- fi
+ remove_module
;;
esac
exit 0
Modified: xsp/trunk/debian/mono-server.templates
===================================================================
--- xsp/trunk/debian/mono-server.templates 2004-05-20 22:25:36 UTC (rev 758)
+++ xsp/trunk/debian/mono-server.templates 2004-05-20 22:37:37 UTC (rev 759)
@@ -1,4 +1,4 @@
-Template: monoserver/monoserver_autostart
+Template: monoserver/monoserver_addmodule
Type: boolean
Default: true
-Description: Would you like to autostart the mod-mono-server when you start your computer?
+Description: Would you like to add mod_mono to Apache?
Copied: xsp/trunk/debian/mono-server_init.old (from rev 620, xsp/trunk/debian/mono-server.init)
Copied: xsp/trunk/debian/mono-server_preinst.old (from rev 620, xsp/trunk/debian/mono-server.preinst)