summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-01-31 19:37:40 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-01-31 19:37:40 +0000
commitc516193f29415207e646c2947be21b978c6873b2 (patch)
tree481419eb195a0421a9d1f975d31bce832cd2acfc /www-apache
parentupdate metadata; cleanup (diff)
downloadgentoo-2-c516193f29415207e646c2947be21b978c6873b2.tar.gz
gentoo-2-c516193f29415207e646c2947be21b978c6873b2.tar.bz2
gentoo-2-c516193f29415207e646c2947be21b978c6873b2.zip
update metadata; cleanup
(Portage version: 2.1.4)
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_macro/ChangeLog8
-rw-r--r--www-apache/mod_macro/files/27_mod_macro.conf56
-rw-r--r--www-apache/mod_macro/metadata.xml3
3 files changed, 32 insertions, 35 deletions
diff --git a/www-apache/mod_macro/ChangeLog b/www-apache/mod_macro/ChangeLog
index 18416a544a0d..0fa4bb26ab8f 100644
--- a/www-apache/mod_macro/ChangeLog
+++ b/www-apache/mod_macro/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apache/mod_macro
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/ChangeLog,v 1.13 2007/12/30 15:10:44 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/ChangeLog,v 1.14 2008/01/31 19:37:39 hollow Exp $
+
+ 31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/27_mod_macro.conf,
+ metadata.xml:
+ update metadata; cleanup
*mod_macro-1.1.10 (30 Dec 2007)
diff --git a/www-apache/mod_macro/files/27_mod_macro.conf b/www-apache/mod_macro/files/27_mod_macro.conf
index 4b845617469b..3f84f985e4bb 100644
--- a/www-apache/mod_macro/files/27_mod_macro.conf
+++ b/www-apache/mod_macro/files/27_mod_macro.conf
@@ -1,34 +1,30 @@
<IfDefine MACRO>
- <IfModule !mod_macro.c>
- LoadModule macro_module modules/mod_macro.so
- </IfModule>
-</IfDefine>
-
-<IfModule mod_macro.c>
- # Definition of a MyVirtualHost Macro.
+LoadModule macro_module modules/mod_macro.so
- <Macro MyVirtualHost $host $port $dir>
- Listen $port
-
- <VirtualHost $host:$port>
- DocumentRoot $dir
-
- <Directory $dir>
- # do something here...
- </Directory>
-
- # limit access to intranet subdir.
- <Directory $dir/intranet>
- order deny,allow
- deny from all
- allow from 10.0.0.0/8
- </Directory>
- </VirtualHost>
- </Macro>
+# Definition of a MyVirtualHost Macro.
+<Macro MyVirtualHost $host $port $dir>
+ Listen $port
- # Use of MyVirtualHost with different arguments.
- #Use MyVirtualHost www.apache.org 80 /projects/apache/web
- #Use MyVirtualHost www.perl.com 8080 /projects/perl/web
- #Use MyVirtualHost www.ensmp.fr 1234 /projects/mines/web
-</IfModule>
+ <VirtualHost $host:$port>
+ DocumentRoot $dir
+
+ <Directory $dir>
+ # do something here...
+ </Directory>
+
+ # limit access to intranet subdir.
+ <Directory $dir/intranet>
+ order deny,allow
+ deny from all
+ allow from 10.0.0.0/8
+ </Directory>
+ </VirtualHost>
+</Macro>
+
+# Use of MyVirtualHost with different arguments.
+#Use MyVirtualHost www.apache.org 80 /projects/apache/web
+#Use MyVirtualHost www.perl.com 8080 /projects/perl/web
+#Use MyVirtualHost www.ensmp.fr 1234 /projects/mines/web
+</IfDefine>
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_macro/metadata.xml b/www-apache/mod_macro/metadata.xml
index a1f5ceff2352..64a719ea1bfd 100644
--- a/www-apache/mod_macro/metadata.xml
+++ b/www-apache/mod_macro/metadata.xml
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>apache</herd>
- <maintainer>
- <email>apache-bugs@gentoo.org</email>
- </maintainer>
</pkgmetadata>