[Pkg-mono-svn-commits] rev 373 - xsp-snapshot/trunk/debian/official
Pablo Fischer
pabl0-guest@quantz.debian.org
Sat, 28 Feb 2004 07:07:06 +0100
Author: pabl0-guest
Date: 2004-02-28 07:07:05 +0100 (Sat, 28 Feb 2004)
New Revision: 373
Modified:
xsp-snapshot/trunk/debian/official/asp.net-examples.postinst
xsp-snapshot/trunk/debian/official/asp.net-examples.prerm
xsp-snapshot/trunk/debian/official/control
xsp-snapshot/trunk/debian/official/mono-server.init
xsp-snapshot/trunk/debian/official/mono-xsp.init
Log:
* control:
+ Removed from Depends of asp.net-examples, the hostmanager, for two reasons:
1) Now the package has another name
2) We should move that package dependency to xsp and mono-server, so we get sure in
the daemon that there is already a VirtualHost file.
* asp.net-examples.*
+ In both packages (prerm and postinst) I replaced the old app name to the new one:
mono-vhostmanager
* init files:
+ Replaced the old app name to the new one
+ Added a new rule in should_start, well not a new one, it is a fix, we force to print the file
and if there are no new lines we print a error and exit
Modified: xsp-snapshot/trunk/debian/official/asp.net-examples.postinst
===================================================================
--- xsp-snapshot/trunk/debian/official/asp.net-examples.postinst 2004-02-28 05:20:17 UTC (rev 372)
+++ xsp-snapshot/trunk/debian/official/asp.net-examples.postinst 2004-02-28 06:07:05 UTC (rev 373)
@@ -3,7 +3,7 @@
if [ -x /usr/share/dotnet/bin/xsp.exe -a -d /etc/xsp ]; then
#Add the host
echo "Updating Root Servers..."
- nethostmanager add --config-file=/etc/xsp/virtual.conf \
+ mono-vhostmanager add --config-file=/etc/xsp/virtual.conf \
--host=/usr/share/asp.net-demos/asp \
--alias=/samples
fi
@@ -11,7 +11,7 @@
if [ -x /usr/share/dotnet/bin/mod-mono-server.exe -a -d /etc/mono-server ]; then
#Add the host
echo "Updating Root Servers..."
- nethostmanager add --config-file=/etc/mono-server/virtual.conf \
+ mono-vhostmanager add --config-file=/etc/mono-server/virtual.conf \
--host=/usr/share/asp.net-demos/asp \
--alias=/samples
fi
Modified: xsp-snapshot/trunk/debian/official/asp.net-examples.prerm
===================================================================
--- xsp-snapshot/trunk/debian/official/asp.net-examples.prerm 2004-02-28 05:20:17 UTC (rev 372)
+++ xsp-snapshot/trunk/debian/official/asp.net-examples.prerm 2004-02-28 06:07:05 UTC (rev 373)
@@ -3,7 +3,7 @@
if [ -x /usr/share/dotnet/bin/xsp.exe -a -d /etc/xsp ]; then
#Add the host
echo "Updating Root Servers..."
- nethostmanager del --config-file=/etc/xsp/virtual.conf \
+ mono-vhostmanager del --config-file=/etc/xsp/virtual.conf \
--host=/usr/share/asp.net-demos/asp \
--alias=/samples
fi
@@ -11,7 +11,7 @@
if [ -x /usr/share/dotnet/bin/mod-mono-server.exe -a -d /etc/mono-server ]; then
#Add the host
echo "Updating Root Servers..."
- nethostmanager del --config-file=/etc/mono-server/virtual.conf \
+ mono-vhostmanager del --config-file=/etc/mono-server/virtual.conf \
--host=/usr/share/asp.net-demos/asp \
--alias=/samples
fi
Modified: xsp-snapshot/trunk/debian/official/control
===================================================================
--- xsp-snapshot/trunk/debian/official/control 2004-02-28 05:20:17 UTC (rev 372)
+++ xsp-snapshot/trunk/debian/official/control 2004-02-28 06:07:05 UTC (rev 373)
@@ -7,7 +7,7 @@
Package: mono-xsp
Architecture: all
-Depends: ${shlibs:Depends}, mono-jit
+Depends: ${shlibs:Depends}, mono-jit, mono-vhostmanager
Description: simple web server to run ASP.NET applications
XSP is a simple web server written in C# that can be used to run your
ASP.NET applications.
@@ -17,14 +17,14 @@
Package: asp.net-examples
Architecture: all
-Depends: ${shlibs:Depends}, mono-xsp | libapache-mod-mono, mono-nethostmanager
+Depends: ${shlibs:Depends}, mono-xsp | libapache-mod-mono
Description: demo pages for ASP.NET infrastructure
Sample set of .aspx pages to test the XSP server or the mod_mono Apache
module.
Package: mono-server
Architecture: all
-Depends: ${shlibs:Depends}, mono-jit
+Depends: ${shlibs:Depends}, mono-jit, mono-vhostmanager
Description: The mod-mono server
It contains the mod-mono-server, that will start the mod-mono server
and create the *socket* (the one in /tmp).
Modified: xsp-snapshot/trunk/debian/official/mono-server.init
===================================================================
--- xsp-snapshot/trunk/debian/official/mono-server.init 2004-02-28 05:20:17 UTC (rev 372)
+++ xsp-snapshot/trunk/debian/official/mono-server.init 2004-02-28 06:07:05 UTC (rev 373)
@@ -52,15 +52,10 @@
fi
- if [ ! -x /usr/bin/nethostmanager ]; then
- echo "Sorry, you don't have any hosts. I suggest you to download asp.net-examples"
- exit 0
- else
- howmany=`nethostmanager print --config-file=$VIRTUALFILE | wc -l`
- if [ $howmany = "0" ]; then
+ hostsempty=`mono-vhostmanager print --config-file=$VIRTUALFILE`
+ if [[ $hostsempty = *NHF* ]]; then
echo "Sorry, you don't have any hosts. I suggest you to download asp.net-examples"
exit 0
- fi
fi
prepare_socket
@@ -72,7 +67,7 @@
case "$1" in
start)
should_start
- virtual_dirs=`nethostmanager print --config-file=$VIRTUALFILE`
+ virtual_dirs=`mono-vhostmanager print --config-file=$VIRTUALFILE`
. $DEFAULT
echo -n "Starting $DESC: $NAME"
start-stop-daemon --start --background --make-pidfile \
@@ -99,7 +94,7 @@
should_start
- virtual_dirs=`nethostmanager print --config-file=$VIRTUALFILE`
+ virtual_dirs=`mono-vhostmanager print --config-file=$VIRTUALFILE`
. $DEFAULT
start-stop-daemon --start --background --make-pidfile \
--quiet --pidfile /var/run/$NAME.pid \
Modified: xsp-snapshot/trunk/debian/official/mono-xsp.init
===================================================================
--- xsp-snapshot/trunk/debian/official/mono-xsp.init 2004-02-28 05:20:17 UTC (rev 372)
+++ xsp-snapshot/trunk/debian/official/mono-xsp.init 2004-02-28 06:07:05 UTC (rev 373)
@@ -37,24 +37,18 @@
exit 0
fi
- if [ ! -x /usr/bin/nethostmanager ]; then
- echo "Sorry, you don't have any hosts. I suggest you to download asp.net-examples"
- exit 0
- else
- howmany=`nethostmanager print --config-file=$VIRTUALFILE | wc -l`
- if [ $howmany = "0" ]; then
+
+ hostsempty=`mono-vhostmanager print --config-file=$VIRTUALFILE`
+ if [[ $hostsempty = *NHF* ]]; then
echo "Sorry, you don't have any hosts. I suggest you to download asp.net-examples"
exit 0
- fi
fi
-
-
}
case "$1" in
start)
should_start
- virtual_dirs=`nethostmanager print --config-file=$VIRTUALFILE`
+ virtual_dirs=`mono-vhostmanager print --config-file=$VIRTUALFILE`
. $DEFAULT
echo -n "Starting $DESC: $NAME"
start-stop-daemon --start --background --make-pidfile \
@@ -79,7 +73,7 @@
sleep 1
should_start
- virtual_dirs=`nethostmanager print --config-file=$VIRTUALFILE`
+ virtual_dirs=`mono-vhostmanager print --config-file=$VIRTUALFILE`
. $DEFAULT
echo "Starting $DESC: $NAME"
start-stop-daemon --start --background --make-pidfile \