martin: server/kolabd/kolabd/templates httpd.local.template, NONE, 1.1 httpd.conf.template, 1.1.1.1, 1.2

[cvs at intevation.de]

Author: martin

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv12767/templates

Modified Files:
	httpd.conf.template 
Added Files:
	httpd.local.template 
Log Message:
Martin K.: Add initial support for local config file extensions. (These shall in the future be preserved between updates)


--- NEW FILE: httpd.local.template ---
# (c) 2004 Martin Konold <martin.konold at erfrakon.de>
# This program is Free Software under the GNU General Public License (>=v2).
# Read the file COPYING that comes with this packages for details.


# this file is initially automatically written by the Kolab config backend
# manualy additions are kept between rpm updates

# 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 (apache.conf)

# e.g.
# ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
#<Directory "/usr/lib/nagios/cgi/">
#    AllowOverride AuthConfig
#    Options ExecCGI
#    Order allow,deny
#    Allow from all
#</Directory>
#
#Alias /nagios/ /usr/share/nagios/
#<Directory "/usr/share/nagios/">
#    Options None
#    AllowOverride AuthConfig
#    Order allow,deny
#    Allow from all
#</Directory>

Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- httpd.conf.template	23 Nov 2004 20:26:47 -0000	1.1.1.1
+++ httpd.conf.template	13 Dec 2004 10:12:16 -0000	1.2
@@ -377,3 +377,6 @@
 BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
 BrowserMatch "^WebDrive" redirect-carefully
 BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+
+# used for local non Kolab extension
+Include @l_prefix@/etc/apache/apache.local