diff options
| -rw-r--r-- | usr.sbin/httpd/Makefile.bsd-wrapper | 10 | ||||
| -rw-r--r-- | usr.sbin/httpd/conf/httpd.conf | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper index 95d33ee620b..c7caae04390 100644 --- a/usr.sbin/httpd/Makefile.bsd-wrapper +++ b/usr.sbin/httpd/Makefile.bsd-wrapper @@ -1,5 +1,5 @@ # Build wrapper for Apache -# $OpenBSD: Makefile.bsd-wrapper,v 1.61 2007/02/19 14:50:20 henning Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.62 2007/10/30 17:49:50 robert Exp $ # Our lndir is hacked; specify a full path to avoid potential conflicts # with the one installed with X11. @@ -219,6 +219,10 @@ XMLFILES= \ src/lib/expat-lite/xmltok.h \ src/lib/expat-lite/xmltok_impl.h +MODCONFDIR= \ + modules \ + modules.sample + CONFFILES= \ conf/httpd.conf-dist conf/httpd.conf \ conf/mime.types conf/magic @@ -734,6 +738,10 @@ cleanman: .endif distribution: + @-for i in ${MODCONFDIR}; do \ + echo "Installing ${DESTDIR}${HTTPD_SYSCONFDIR}/$$i"; \ + ${INSTALL} -d -m 755 ${DESTDIR}${HTTPD_SYSCONFDIR}/$$i; \ + done @-for i in ${CONFFILES}; do \ j=`dirname $$i`; \ echo "Installing ${DESTDIR}${HTTPD_PREFIX}/$$i"; \ diff --git a/usr.sbin/httpd/conf/httpd.conf b/usr.sbin/httpd/conf/httpd.conf index 519f6012dd6..5d72900256a 100644 --- a/usr.sbin/httpd/conf/httpd.conf +++ b/usr.sbin/httpd/conf/httpd.conf @@ -1,4 +1,4 @@ -# $OpenBSD: httpd.conf,v 1.20 2007/03/22 20:08:18 pyr Exp $ +# $OpenBSD: httpd.conf,v 1.21 2007/10/30 17:49:50 robert Exp $ # # Based upon the NCSA server configuration files originally by Rob McCool. # @@ -273,6 +273,11 @@ MaxSTACKPerChild 0 # LoadModule proxy_module /usr/lib/apache/modules/libproxy.so # +# Include extra module configuration files +# +Include /var/www/conf/modules/*.conf + +# # ExtendedStatus controls whether Apache will generate "full" status # information (ExtendedStatus On) or just basic information (ExtendedStatus # Off) when the "server-status" handler is called. The default is Off. @@ -1106,4 +1111,3 @@ CustomLog logs/ssl_request_log \ </VirtualHost> </IfDefine> - |