gunnar: server/kolabd/kolabd/templates httpd.conf.template.in, 1.13, 1.14 httpd.local.template.in, 1.2, 1.3
cvs at kolab.org
cvs at kolab.org
Sun Oct 14 14:32:00 CEST 2007
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv28173/kolabd/kolabd/templates
Modified Files:
httpd.conf.template.in httpd.local.template.in
Log Message:
OpenPKG renamed apache2 back to apache.
Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- httpd.conf.template.in 8 Oct 2007 15:39:27 -0000 1.13
+++ httpd.conf.template.in 14 Oct 2007 12:31:58 -0000 1.14
@@ -1,5 +1,5 @@
KOLAB_META_START
-TARGET=@webserver_confdir@/apache2.conf
+TARGET=@webserver_confdir@/apache.conf
PERMISSIONS=0640
OWNERSHIP=@webserver_usr@:@webserver_grp@
KOLAB_META_END
@@ -167,7 +167,7 @@
</Files>
# FIXME: not autoconfigured - still hardcoded
-TypesConfig etc/apache2/mime.types
+TypesConfig etc/apache/mime.types
DefaultType text/plain
<IfModule mime_magic_module>
MIMEMagicFile @webserver_confdir@/mime.magic
@@ -403,7 +403,7 @@
AddCharset EUC-KR .euc-kr
AddCharset shift_jis .sjis
-LoadModule php5_module @libexecdir@/apache2/libphp5.so
+LoadModule php5_module @libexecdir@/apache/mod_php.so
AddType application/x-tar .tgz
AddType application/x-httpd-php .php .php4 .php3 .html
AddType image/x-icon .ico
@@ -420,5 +420,5 @@
BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
# used for local non Kolab extension
-Include @webserver_confdir@/apache2.local
-Include @webserver_confdir@/*.include
\ No newline at end of file
+Include @webserver_confdir@/apache.local
+Include @webserver_confdir@/*.include
Index: httpd.local.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.local.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- httpd.local.template.in 17 Jul 2007 15:26:05 -0000 1.2
+++ httpd.local.template.in 14 Oct 2007 12:31:58 -0000 1.3
@@ -1,5 +1,5 @@
KOLAB_META_START
-TARGET=@webserver_confdir@/apache2.local
+TARGET=@webserver_confdir@/apache.local
PERMISSIONS=0640
OWNERSHIP=@webserver_musr@:@webserver_grp@
KOLAB_META_END
@@ -13,7 +13,7 @@
# The purpose of this file is to add local non Kolab specific extensions to
# the Apache installation. This file gets included at the end of the Apache
-# configuration file (apache2.conf)
+# configuration file (apache.conf)
# e.g.
# ScriptAlias /nagios/cgi-bin/ @libdir@/nagios/cgi/
More information about the commits
mailing list