cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't sample /var/www/conf/modules.samples/, let webapps do that.

Browse Source 
Optionaly include /var/www/conf/modules/*.conf instead of /etc/apache2/modules/*.conf,
this allows the usual MESSAGE linking from modules.samples/ to modules/ to work
out-of-the-box.

ok sthen@
This commit is contained in:
ajacoutot 2015-12-30 09:59:31 +00:00
parent 0164e2e567
commit 4edf8e6414
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/apache-httpd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.71 2015/12/23 14:51:55 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.72 2015/12/30 09:59:31 ajacoutot Exp $
COMMENT-main= apache HTTP server
COMMENT-common= shared files for Apache 1 and 2
@ -10,6 +10,7 @@ PKGNAME= apache-httpd-${V}
PKGNAME-main= ${PKGNAME}
FULLPKGNAME-common= apache-httpd-common-${V}
FULLPKGPATH-common= www/apache-httpd,-common
REVISION-main= 0
CATEGORIES= www net

4
www/apache-httpd/patches/patch-docs_conf_httpd_conf_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-docs_conf_httpd_conf_in,v 1.6 2015/12/23 14:51:55 ajacoutot Exp $
$OpenBSD: patch-docs_conf_httpd_conf_in,v 1.7 2015/12/30 09:59:31 ajacoutot Exp $
--- docs/conf/httpd.conf.in.orig Tue Nov 3 12:58:58 2015
+++ docs/conf/httpd.conf.in Mon Dec 21 13:59:16 2015
@@ -74,8 +74,8 @@ Listen @@Port@@
@ -17,4 +17,4 @@ $OpenBSD: patch-docs_conf_httpd_conf_in,v 1.6 2015/12/23 14:51:55 ajacoutot Exp
</IfModule>
+# Include extra module configuration files
+Include @rel_sysconfdir@/modules/*.conf
+IncludeOptional /var/www/conf/modules/*.conf

5
www/apache-httpd/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.9 2015/12/01 16:45:30 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.10 2015/12/30 09:59:31 ajacoutot Exp $
@pkgpath www/apache-httpd${FLAVOR_COMMA}
@bin bin/ab
bin/dbmmanage2
@ -1358,8 +1358,7 @@ share/examples/apache2/conf/magic
@sample ${CONFDIR}/magic
share/examples/apache2/conf/mime.types
@sample ${CONFDIR}/mime.types
@sample ${CONFDIR}/modules/
@sample ${CONFDIR}/modules.sample/
@sample /var/www/conf/modules/
share/examples/apache2/conf/original/
share/examples/apache2/conf/original/extra/
share/examples/apache2/conf/original/extra/httpd-autoindex.conf