summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Parpart <trapni@gentoo.org>2005-02-17 05:36:55 +0000
committerChristian Parpart <trapni@gentoo.org>2005-02-17 05:36:55 +0000
commitdb13c19816f2c26852de1f6bdac40cf1ddd7a745 (patch)
tree6a3ac7907bf6435a7313ff6c30fe1f7f512f3945 /www-apache
parentNew version (Manifest recommit) (diff)
downloadgentoo-2-db13c19816f2c26852de1f6bdac40cf1ddd7a745.tar.gz
gentoo-2-db13c19816f2c26852de1f6bdac40cf1ddd7a745.tar.bz2
gentoo-2-db13c19816f2c26852de1f6bdac40cf1ddd7a745.zip
adopted to changes recommented in bug 70943
(Portage version: 2.0.51-r15)
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_mono/ChangeLog6
-rw-r--r--www-apache/mod_mono/files/mod_mono-1.0.5-70_mod_mono.conf44
2 files changed, 33 insertions, 17 deletions
diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog
index eac97875d3e9..8aae2facd68c 100644
--- a/www-apache/mod_mono/ChangeLog
+++ b/www-apache/mod_mono/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apache/mod_mono
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.12 2005/02/17 05:07:16 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.13 2005/02/17 05:36:55 trapni Exp $
+
+ 17 Feb 2005; Christian Parpart <trapni@gentoo.org>
+ files/mod_mono-1.0.5-70_mod_mono.conf:
+ adopted to changes recommented in bug 70943
17 Feb 2005; Christian Parpart <trapni@gentoo.org>
files/mod_mono-1.0.5-70_mod_mono.conf:
diff --git a/www-apache/mod_mono/files/mod_mono-1.0.5-70_mod_mono.conf b/www-apache/mod_mono/files/mod_mono-1.0.5-70_mod_mono.conf
index c5ea8532822d..2b10ba4b6465 100644
--- a/www-apache/mod_mono/files/mod_mono-1.0.5-70_mod_mono.conf
+++ b/www-apache/mod_mono/files/mod_mono-1.0.5-70_mod_mono.conf
@@ -1,27 +1,39 @@
+# For more information on the Mono* directives, see the man page for
+# mod_mono(8)
+
<IfDefine MONO>
+ # Set this to False if you manage your ASP.Net server through
+ # /etc/init.d/mod-mono-server
+ MonoRunXSP False
+
<IfModule !mod_mono.c>
- LoadModule mono_module modules/mod_mono.so
+ LoadModule mono_module extramodules/mod_mono.so
</IfModule>
<IfModule mod_mime.c>
AddHandler mono .aspx .ashx .asmx .ascx .asax .config .ascx
</IfModule>
- MonoUnixSocket /tmp/mod_mono_server
-
-#### Uncomment this block to enable the xsp samples
-####
-# <IfModule mod_alias.c>
-# Alias /mono "/usr/share/doc/xsp/test"
-# </IfModule>
-# MonoApplications "/mono:/usr/share/doc/xsp/test"
-# <Directory /usr/share/doc/xsp/test>
-# #SetHandler mono
-# <IfModule mod_access.c>
-# Order allow,deny
-# Allow from all
-# </IfModule>
-# </Directory>
+### please also add "-D MONO_DEMO" in order to activate out-of-the-box mono demo
+###
+ <IfDefine MONO_DEMO>
+ <IfModule mod_alias.c>
+ Alias /mono "/usr/share/doc/xsp/test"
+ </IfModule>
+
+ MonoApplications "/mono:/usr/share/doc/xsp/test"
+
+ <Directory /usr/share/doc/xsp/test>
+ <IfModule mod_access.c>
+ Order allow,deny
+ Allow from all
+ </IfModule>
+ <IfModule mod_dir.c>
+ DirectoryIndex index.aspx
+ </IfModule>
+ </Directory>
+ </IfDefine>
+### MONO_DEMO end.
</IfDefine>