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

[Pablo Fischer]

Author: pabl0-guest
Date: 2004-05-21 12:32:05 -0600 (Fri, 21 May 2004)
New Revision: 773

Modified:
   xsp/trunk/debian/changelog
   xsp/trunk/debian/mono-server-update.conf
Log:
Some fixes, and new version


Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog	2004-05-21 18:28:48 UTC (rev 772)
+++ xsp/trunk/debian/changelog	2004-05-21 18:32:05 UTC (rev 773)
@@ -1,4 +1,4 @@
-xsp (0.12) unstable; urgency=low
+xsp (0.12-1) unstable; urgency=low
 
   * NEW Release!
   * This new release use the new mod-mono-server, that for now it will not be

Modified: xsp/trunk/debian/mono-server-update.conf
===================================================================
--- xsp/trunk/debian/mono-server-update.conf	2004-05-21 18:28:48 UTC (rev 772)
+++ xsp/trunk/debian/mono-server-update.conf	2004-05-21 18:32:05 UTC (rev 773)
@@ -52,6 +52,8 @@
     $applications =~ s/,$//;
     #sed the $monoserver_hostfile to replace the Applications
     &replace_applications;
+    #Close the file with a </Ifmodule> tag
+    &writetempdefault_end;
     #cp the temp file to the original one..    
     system("cp -f $monoserver_hostfile.tmp $monoserver_hostfile");    
     #rm the temp
@@ -107,7 +109,7 @@
     #How many dirs?
     if($#host_dirs ne "0") {
 	#Write default content
-	&write_tempdefault;
+	&write_tempdefault_start;
 	foreach my $dir (@host_dirs) {
 	    if(($dir ne "..") && ($dir ne ".")) {
 		#Ok, in the dir.. we have more files, so read them
@@ -145,19 +147,30 @@
 }
 
    
-sub write_tempdefault {
+sub write_tempdefault_start {
     open(TEMPHOST, ">> $monoserver_hostfile.tmp");
 
     print TEMPHOST "# Default configuration, don't edit it!\n";
-    print TEMPHOST "MonoUnixSocket /tmp/mod_mono_server\n";    
-    print TEMPHOST "MonoServerPath /usr/share/dotnet/bin/mod-mono-server.exe\n";
-    print TEMPHOST "MonoApplications \n";
+    print TEMPHOST "<IfModule mod_mono.c>\n";
+    print TEMPHOST "  MonoUnixSocket /tmp/.mod_mono_server\n";    
+    print TEMPHOST "  MonoServerPath /usr/share/dotnet/bin/mod-mono-server.exe\n";
+    print TEMPHOST "  AddType application/x-asp-net .aspx .ashx .asmx .ascx .asax .config .ascx\n";
+    print TEMPHOST "  MonoApplications \n";
     print TEMPHOST "\n\n\n";
 
     close(TEMPHOST);
     
 }
+
+sub writetempdefault_end {
+     open(TEMPHOST, ">> $monoserver_hostfile.tmp");
+
+    print TEMPHOST "</IfModule>\n";
+
+    close(TEMPHOST);
     
+}
+   
 sub write_tempxsphostfile {
     my $hostfile = shift;
 
@@ -203,13 +216,13 @@
     
     if($path) {
 	print TEMPHOST "# start $hostfile\n";
-	print TEMPHOST "   Alias $alias \"$path\"\n";
-	print TEMPHOST "     <Directory $path>\n";
-	print TEMPHOST "       SetHandler mono\n";
-	print TEMPHOST "         <IfModule mod_dir.c>\n";
-	print TEMPHOST "            DirectoryIndex index.aspx\n";
-	print TEMPHOST "         </IfModule>\n";
-	print TEMPHOST "     </Directory>\n";
+	print TEMPHOST "     Alias $alias \"$path\"\n";
+	print TEMPHOST "       <Directory $path>\n";
+	print TEMPHOST "         SetHandler mono\n";
+	print TEMPHOST "           <IfModule mod_dir.c>\n";
+	print TEMPHOST "              DirectoryIndex index.aspx\n";
+	print TEMPHOST "           </IfModule>\n";
+	print TEMPHOST "       </Directory>\n";
 	print TEMPHOST "# end $hostfile\n";
     }
     close(TEMPHOST);