[Pkg-mono-svn-commits] rev 442 - libapache-mod-mono/trunk/debian

Pablo Fischer pabl0-guest@haydn.debian.org
Tue, 16 Mar 2004 11:27:57 -0700


Author: pabl0-guest
Date: 2004-03-16 11:27:55 -0700 (Tue, 16 Mar 2004)
New Revision: 442

Modified:
   libapache-mod-mono/trunk/debian/README.Debian
   libapache-mod-mono/trunk/debian/TODO
   libapache-mod-mono/trunk/debian/control
   libapache-mod-mono/trunk/debian/copyright
   libapache-mod-mono/trunk/debian/files
   libapache-mod-mono/trunk/debian/libapache-mod-mono.postinst
   libapache-mod-mono/trunk/debian/libapache-mod-mono.prerm
   libapache-mod-mono/trunk/debian/mono.conf
Log:
* libapache-mod-mono.prerm
	+ Fixed the apachecfg dir, I was using apache2.. and eww.. we are using apache 1.3, Fixed!
* control
	+ Removed libapache-mod-mono from the mono-server dependencies. When we are uninstalling 
	mod_mono we need mono-server to stop the daemon, removing it, fixes the problem
* libapache-mod-mono.postinst:
	+ A fix in the rules, in the != ones, I should do: "$var" != "cond", instead of
 	$var != "cond"
	+ Removed the turn on and turn off options, we don't need them, just with modules-config, and that's
	all what we need to activate the mod_mono module, and added a disable functiont to disable
	the module
* README.Debian
	+ Added with a brief explanation of what is the package and what is mod_mono.
* mono.conf:
	+ Added a new alias, /monodoc, for /monodoc application

* Otheres, just updated..


Modified: libapache-mod-mono/trunk/debian/README.Debian
===================================================================
--- libapache-mod-mono/trunk/debian/README.Debian	2004-03-16 18:23:19 UTC (rev 441)
+++ libapache-mod-mono/trunk/debian/README.Debian	2004-03-16 18:27:55 UTC (rev 442)
@@ -1,6 +1,14 @@
 libapache-mod-mono for Debian
 -----------------------------
 
-<possible notes regarding this package - if none, delete this file>
+libapache-mod-mono contains the mod_mono module for Apache that is needed to run 
+asp.net applications in Apache.
 
- -- Pablo Fischer <pablo@pablo.com.mx>, Wed, 18 Feb 2004 20:18:38 -0600
+libapache-mod-mono depends on mono-server, cause mod_mono needs a socket to be connected, and
+mono-server (mod-mono-server) has it.
+
+If you want use apache as your webserver to run asp.net applications and want to test your
+own application, I suggest you to add a new alias in /etc/apache/conf.d/mono.conf and read the
+README.Debian of mono-server.
+
+ -- Pablo Fischer <pablo@pablo.com.mx>, Sat, 28 Feb 2004 14:55:56 -0600

Modified: libapache-mod-mono/trunk/debian/TODO
===================================================================
--- libapache-mod-mono/trunk/debian/TODO	2004-03-16 18:23:19 UTC (rev 441)
+++ libapache-mod-mono/trunk/debian/TODO	2004-03-16 18:27:55 UTC (rev 442)
@@ -1,17 +1,3 @@
-29 feb 2004 02:52:53
+29 feb 2004 02:52:24
 
-* Look in #debian-mono for beta testers :)
-
-
-18 feb 2004 00:34:36 (pablo)
-
-* I need to find WHY the build process doesn't wants to create the .info and .conf files inside the libapache-mod-mono directory, URGENT.
-* I also renamed the files to their package name (filename to filename.package)
-
-See ya..
-
-22 ene 2004 22:15:15 (pablo)
-
-* I talked with Gonzalo and he told me that XSP is just a webserver. So a user can run any asp.net test without running the xsp webserver by just having mod_mono in apache, however, the only thing that is really needed is: mod-mono-server, in few words: a user can use xsp or apache (with mod_mono) to run asp.net samples, the only thing that is really needed for xsp or apache is: mod-mono-server.
-
-See ya!
+* Look for beta testers :)

Modified: libapache-mod-mono/trunk/debian/control
===================================================================
--- libapache-mod-mono/trunk/debian/control	2004-03-16 18:23:19 UTC (rev 441)
+++ libapache-mod-mono/trunk/debian/control	2004-03-16 18:27:55 UTC (rev 442)
@@ -6,7 +6,7 @@
 Standards-Version: 3.6.0
 
 Package: libapache-mod-mono
-Architecture: i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache (>= 1.3.27-0.1), mono-jit, mono-server
+Architecture: any
+Depends: ${shlibs:Depends}, apache (>= 1.3.27-0.1), mono-jit, mono-server
 Description: Run ASP.NET Pages on UNIX with Apache and Mono
  Run ASP.NET pages on Unix with Apache and Mono!

Modified: libapache-mod-mono/trunk/debian/copyright
===================================================================
--- libapache-mod-mono/trunk/debian/copyright	2004-03-16 18:23:19 UTC (rev 441)
+++ libapache-mod-mono/trunk/debian/copyright	2004-03-16 18:27:55 UTC (rev 442)
@@ -1,5 +1,5 @@
 This package was debianized by Pablo Fischer <pablo@pablo.com.mx> on
-Wed, 18 Feb 2004 20:18:38 -0600.
+Sat, 28 Feb 2004 14:55:56 -0600.
 
 It was downloaded from <fill in ftp site>
 

Modified: libapache-mod-mono/trunk/debian/files
===================================================================
--- libapache-mod-mono/trunk/debian/files	2004-03-16 18:23:19 UTC (rev 441)
+++ libapache-mod-mono/trunk/debian/files	2004-03-16 18:27:55 UTC (rev 442)
@@ -1 +1 @@
-libapache-mod-mono_0.7-1_i386.deb unknown optional
+libapache-mod-mono_0.7-2_i386.deb unknown optional

Modified: libapache-mod-mono/trunk/debian/libapache-mod-mono.postinst
===================================================================
--- libapache-mod-mono/trunk/debian/libapache-mod-mono.postinst	2004-03-16 18:23:19 UTC (rev 441)
+++ libapache-mod-mono/trunk/debian/libapache-mod-mono.postinst	2004-03-16 18:27:55 UTC (rev 442)
@@ -21,17 +21,17 @@
 
 }
 
-turnon_type() {
-                sed "s/#AddType/AddType/g" $modmono_conf > $tempfile
-                cp -f $tempfile $modmono_conf
-		rm -Rf $tempfile
+disable_module() {
+for i in apache apache-ssl; do
+        if [ -e $apachecfg ]; then
+            if [ -d /etc/$i ]; then
+                modules-config $i disable mod_mono
+            fi
+	fi
+done
+       
 }
 
-turnoff_type() {
-                sed "s/AddType/#AddType/g" $modmono_conf > $tempfile
-                cp -f $tempfile $modmono_conf
-		rm -Rf $tempfile
-}
 
 restart_apache() {
     #Apache is already running?
@@ -40,7 +40,7 @@
 	apache_pid=`cat /var/run/apache.pid`
 	apache_ps=`ps -p $apache_pid | wc -l`
  	# Are there any process running by that pid?
-	if [ $apache_ps != "1" ]; then
+	if [ "$apache_ps" != "1" ]; then
 	    /etc/init.d/apache restart
 	fi
     fi
@@ -62,20 +62,18 @@
     db_get libapache-mod-mono/activate
     modmono_activate="$RET"
 
-    if [ "$modmono_activate" = "true" ]; then
+    if [ $modmono_activate = "true" ]; then
         activate_module
-        if `cat $modmono_conf | grep -xq "#AddType^"`; then
-            turnon_type
-        fi
-	restart_apache
-	restart_monoserver
     else
-        if `cat $modmono_conf | grep -xq "AddType^"`; then
-            turnoff_type
-        fi
+	disable_module
     fi
 
+    restart_apache
+    restart_monoserver
     
+    rm -Rf $tempfile
+
+    
     # Should we restart Apache?
     ;;
 

Modified: libapache-mod-mono/trunk/debian/libapache-mod-mono.prerm
===================================================================
--- libapache-mod-mono/trunk/debian/libapache-mod-mono.prerm	2004-03-16 18:23:19 UTC (rev 441)
+++ libapache-mod-mono/trunk/debian/libapache-mod-mono.prerm	2004-03-16 18:27:55 UTC (rev 442)
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-apachecfg="/etc/apache2"
+apachecfg="/etc/apache"
 
 turnoff_module() {
 for i in apache apache-ssl; do
@@ -21,7 +21,7 @@
 	apache_pid=`cat /var/run/apache.pid`
 	apache_ps=`ps -p $apache_pid | wc -l`
  	# Are there any process running by that pid?
-	if [ $apache_ps != "1" ]; then
+	if [ "$apache_ps" != "1" ]; then
 	    /etc/init.d/apache restart
 	fi
     fi
@@ -34,7 +34,7 @@
 	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
+	if [ "$xsp_ps" != "1" ]; then
 	    #Ok.. is recommended to start it, but, should we do this?, NO!
 	    /etc/init.d/mono-server stop
 	fi

Modified: libapache-mod-mono/trunk/debian/mono.conf
===================================================================
--- libapache-mod-mono/trunk/debian/mono.conf	2004-03-16 18:23:19 UTC (rev 441)
+++ libapache-mod-mono/trunk/debian/mono.conf	2004-03-16 18:27:55 UTC (rev 442)
@@ -7,5 +7,6 @@
 	DirectoryIndex index.aspx
 	# The ASP.NET examples directory, create an Alias
 	Alias /samples /usr/share/asp.net-demos/asp
+	Alias /monodoc /usr/share/dotnet/monodoc/web
 </IfModule>