summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wickert <wickert@kolabsys.com>2010-12-12 23:40:48 (GMT)
committerChristoph Wickert <wickert@kolabsys.com>2010-12-12 23:40:48 (GMT)
commitc44eeabe545d23ac04773f733d8a674cb0f9df13 (patch)
treec34af147efa870d17942974a198295da93f0fec4
parentfa9be87a22170a7d4e3dd3af7e2fe24b33ad91ab (diff)
downloadkolab-conf-c44eeabe545d23ac04773f733d8a674cb0f9df13.tar.gz
kolab/issue2366 kolab/issue2366 (kolab break the openpkg apache.d/*.conf configuration scheme) - more fixes to follow
-rw-r--r--conf/templates/httpd.conf.template6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/templates/httpd.conf.template b/conf/templates/httpd.conf.template
index 6040988..82822a9 100644
--- a/conf/templates/httpd.conf.template
+++ b/conf/templates/httpd.conf.template
@@ -54,9 +54,9 @@ RewriteOptions inherit
<Directory "@@@webserver_cgidir@@@">
SSLOptions +StdEnvVars
</Directory>
-
+
</VirtualHost>
-
+
#<IfModule !mpm_winnt.c>
#<IfModule !mpm_netware.c>
#LockFile @@@webserver_acceptlock@@@
@@ -372,4 +372,4 @@ BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
# used for local non Kolab extension
Include @@@webserver_confdir@@@/apache.local
-Include @@@webserver_confdir@@@/*.include
+Include @@@webserver_confdir@@@/apache.d/*.conf