mathieu: server/kolabd/kolabd/templates DB_CONFIG.slapd.template.in, 1.6, 1.7 access.template.in, 1.2, 1.3 amavisd.conf.template.in, 1.15, 1.16 canonical.template.in, 1.1, 1.2 clamd.conf.template.in, 1.6, 1.7 cyrus.conf.template.in, 1.8, 1.9 freebusy.conf.template.in, 1.21, 1.22 freshclam.conf.template.in, 1.3, 1.4 header_checks.template.in, 1.1, 1.2 httpd.conf.template.in, 1.30, 1.31 httpd.local.template.in, 1.4, 1.5 imapd.conf.template.in, 1.17, 1.18 imapd.group.template.in, 1.2, 1.3 kolab_smtpdpolicy.conf.template.in, 1.3, 1.4 ldap.conf.template.in, 1.2, 1.3 ldapdistlist.cf.template.in, 1.4, 1.5 ldaptransport.cf.template.in, 1.2, 1.3 ldapvirtual.cf.template.in, 1.2, 1.3 local.cf.template.in, 1.2, 1.3 main.cf.template.in, 1.25, 1.26 master.cf.template.in, 1.27, 1.28 php.ini.template.in, 1.10, 1.11 rc.conf.template.in, 1.6, 1.7 relocated.template.in, 1.1, 1.2 resmgr.conf.template.in, 1.36, 1.37 saslauthd.conf.template.in, 1.5, 1.6 session_vars.php.template.in, 1.6, 1.7 slapd.access.template.in, 1.2, 1.3 slapd.conf.templa te.in, 1.29, 1.30 slapd.replicas.template.in, 1.4, 1.5 transport.template.in, 1.8, 1.9 virtual.template.in, 1.8, 1.9

cvs at kolab.org cvs at kolab.org
Sun Dec 13 19:04:40 CET 2009


Author: mathieu

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

Modified Files:
	DB_CONFIG.slapd.template.in access.template.in 
	amavisd.conf.template.in canonical.template.in 
	clamd.conf.template.in cyrus.conf.template.in 
	freebusy.conf.template.in freshclam.conf.template.in 
	header_checks.template.in httpd.conf.template.in 
	httpd.local.template.in imapd.conf.template.in 
	imapd.group.template.in kolab_smtpdpolicy.conf.template.in 
	ldap.conf.template.in ldapdistlist.cf.template.in 
	ldaptransport.cf.template.in ldapvirtual.cf.template.in 
	local.cf.template.in main.cf.template.in master.cf.template.in 
	php.ini.template.in rc.conf.template.in relocated.template.in 
	resmgr.conf.template.in saslauthd.conf.template.in 
	session_vars.php.template.in slapd.access.template.in 
	slapd.conf.template.in slapd.replicas.template.in 
	transport.template.in virtual.template.in 
Log Message:
kolab/issue1671 (Improving the warning about kolab templates within
                 configuration files)


Index: DB_CONFIG.slapd.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/DB_CONFIG.slapd.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DB_CONFIG.slapd.template.in	13 Dec 2009 15:19:23 -0000	1.6
+++ DB_CONFIG.slapd.template.in	13 Dec 2009 18:04:37 -0000	1.7
@@ -10,8 +10,7 @@
 # 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 automatically written by the Kolab config backend and should have the
-# file mode 0640
+@@@warning@@@
 
 set_cachesize   0       26214400        1
 set_tmp_dir /dev/shm

Index: access.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/access.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- access.template.in	13 Dec 2009 15:19:23 -0000	1.2
+++ access.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -8,8 +8,5 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/access.template
+@@@warning@@@
 

Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- amavisd.conf.template.in	7 Apr 2009 13:31:16 -0000	1.15
+++ amavisd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.16
@@ -4,8 +4,7 @@
 OWNERSHIP=@amavisd_usr@:@amavisd_grp@
 RUNONCHANGE=@KOLABRC@ rc amavisd restart
 KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 use strict;
 

Index: canonical.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/canonical.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- canonical.template.in	17 Nov 2008 18:28:40 -0000	1.1
+++ canonical.template.in	13 Dec 2009 18:04:37 -0000	1.2
@@ -8,7 +8,5 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/canonical.template
+@@@warning@@@
+

Index: clamd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/clamd.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clamd.conf.template.in	13 May 2009 11:11:51 -0000	1.6
+++ clamd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.7
@@ -4,8 +4,8 @@
 OWNERSHIP=@clamav_usr@:@clamav_grp@
 RUNONCHANGE=@KOLABRC@ rc clamav restart
 KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
+
 ##
 ## Example config file for the Clam AV daemon
 ## Please read the clamd.conf(5) manual before editing this file.

Index: cyrus.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/cyrus.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cyrus.conf.template.in	7 May 2009 16:13:33 -0000	1.8
+++ cyrus.conf.template.in	13 Dec 2009 18:04:37 -0000	1.9
@@ -10,9 +10,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
-
+@@@warning@@@
 
 START {
   # do not delete this entry!

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- freebusy.conf.template.in	10 Feb 2009 22:41:14 -0000	1.21
+++ freebusy.conf.template.in	13 Dec 2009 18:04:37 -0000	1.22
@@ -4,6 +4,7 @@
 OWNERSHIP=@freebusy_usr@:@freebusy_grp@
 KOLAB_META_END
 <?php
+@@@warning@@@
 
 /*  
  *  COPYRIGHT

Index: freshclam.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freshclam.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freshclam.conf.template.in	26 Mar 2009 16:17:15 -0000	1.3
+++ freshclam.conf.template.in	13 Dec 2009 18:04:37 -0000	1.4
@@ -3,8 +3,8 @@
 PERMISSIONS=0640
 OWNERSHIP=@clamav_usr@:@clamav_grp@
 KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
+
 ##
 ## Example config file for freshclam
 ## Please read the freshclam.conf(5) manual before editing this file.

Index: header_checks.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/header_checks.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- header_checks.template.in	5 Mar 2008 17:13:15 -0000	1.1
+++ header_checks.template.in	13 Dec 2009 18:04:37 -0000	1.2
@@ -3,10 +3,7 @@
 PERMISSIONS=0640
 OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
 KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/header_checks.template
+@@@warning@@@
 
 # Cyrus does not like empty Message-Id: headers, see kolab/issue2350
 /^Message-Id:[[:space:]]*$/	IGNORE

Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- httpd.conf.template.in	22 May 2009 19:10:28 -0000	1.30
+++ httpd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.31
@@ -10,8 +10,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 ### Section 1: Global Environment
 ServerRoot "@prefix@"

Index: httpd.local.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.local.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- httpd.local.template.in	17 Mar 2009 13:15:16 -0000	1.4
+++ httpd.local.template.in	13 Dec 2009 18:04:37 -0000	1.5
@@ -8,9 +8,7 @@
 # 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
+@@@warning@@@
 
 # 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

Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- imapd.conf.template.in	7 May 2009 16:13:33 -0000	1.17
+++ imapd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.18
@@ -10,10 +10,7 @@
 # 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 automatically written by the Kolab config backend.
-# Manual additions are lost unless made to the template in the Kolab config directory.
-# The template is @sysconfdir@/kolab/templates/imapd.conf.template
-
+@@@warning@@@
 
 #   Warning: Do not use a trailing slash in paths!
 configdirectory:        @imap_statedir@

Index: imapd.group.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.group.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imapd.group.template.in	13 Dec 2009 15:19:23 -0000	1.2
+++ imapd.group.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -8,6 +8,8 @@
 ## This program is Free Software under the GNU General Public License (>=v2).
 ## Read the file COPYING that comes with this packages for details.
 
+@@@warning@@@
+
 # gid's over 60000 are reserved for LDAP groups !
 @@@print getCyrusGroups()@@@
 

Index: kolab_smtpdpolicy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/kolab_smtpdpolicy.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_smtpdpolicy.conf.template.in	31 Jan 2006 22:20:16 -0000	1.3
+++ kolab_smtpdpolicy.conf.template.in	13 Dec 2009 18:04:37 -0000	1.4
@@ -8,8 +8,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 ldap_uri: @@@ldap_uri@@@
 basedn: @@@user_dn_list@@@

Index: ldap.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldap.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ldap.conf.template.in	22 Nov 2005 22:54:09 -0000	1.2
+++ ldap.conf.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -7,11 +7,8 @@
 # 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 automatically written by the Kolab config backend and should have the 
-# file mode 0644
+@@@warning@@@
 
-# manual additions are lost unless made to the template in the Kolab config directory
-# the template is  @sysconfdir@/kolab/templates/ldap.conf.template
 #
 # LDAP Defaults
 #

Index: ldapdistlist.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldapdistlist.cf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ldapdistlist.cf.template.in	30 Nov 2007 11:14:58 -0000	1.4
+++ ldapdistlist.cf.template.in	13 Dec 2009 18:04:37 -0000	1.5
@@ -8,9 +8,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template file ldapdistlist.cf.template
-# in the Kolab config directory
+@@@warning@@@
 
 #
 # LDAP Distributionlist support for postfix

Index: ldaptransport.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldaptransport.cf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ldaptransport.cf.template.in	17 Mar 2009 16:46:31 -0000	1.2
+++ ldaptransport.cf.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -9,8 +9,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 #
 # LDAP Transport for multilocation support

Index: ldapvirtual.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/ldapvirtual.cf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ldapvirtual.cf.template.in	27 Mar 2009 12:09:27 -0000	1.2
+++ ldapvirtual.cf.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -8,8 +8,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 #
 # LDAP Alias support for postfix

Index: local.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/local.cf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- local.cf.template.in	24 Nov 2009 20:34:33 -0000	1.2
+++ local.cf.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -8,10 +8,8 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/local.cf.template
+@@@warning@@@
+
 ##
 ##  @spamassassin_confdir@/local.cf -- site-wide defaults for SpamAssassin
 ##  (see 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked)

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- main.cf.template.in	26 Nov 2009 15:01:18 -0000	1.25
+++ main.cf.template.in	13 Dec 2009 18:04:37 -0000	1.26
@@ -11,9 +11,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 # postfix default is 10 240 000 Byte = 10.24 Megabyte, 
 # we use 20 Megabyte = 20*2^20 Byte as Kolab default

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- master.cf.template.in	14 May 2009 10:58:33 -0000	1.27
+++ master.cf.template.in	13 Dec 2009 18:04:37 -0000	1.28
@@ -11,9 +11,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 # ==========================================================================
 # service type  private unpriv  chroot  wakeup  maxproc command + args

Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- php.ini.template.in	2 Dec 2009 18:10:31 -0000	1.10
+++ php.ini.template.in	13 Dec 2009 18:04:37 -0000	1.11
@@ -3,7 +3,10 @@
 PERMISSIONS=0640
 OWNERSHIP=@webserver_musr@:@webserver_grp@
 RUNONCHANGE=@KOLABRC@ rc apache reload
+COMMENT_CHAR=;
 KOLAB_META_END
+@@@warning@@@
+
 ;;
 ;;  php.ini -- PHP Configuration
 ;;

Index: rc.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/rc.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rc.conf.template.in	17 Mar 2009 11:20:57 -0000	1.6
+++ rc.conf.template.in	13 Dec 2009 18:04:37 -0000	1.7
@@ -8,8 +8,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 openldap_url="ldap://@@@bind_addr@@@/ ldaps://@@@bind_addr@@@/"
 sasl_authmech="ldap"

Index: relocated.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/relocated.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- relocated.template.in	17 Nov 2008 18:28:40 -0000	1.1
+++ relocated.template.in	13 Dec 2009 18:04:37 -0000	1.2
@@ -8,7 +8,5 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/relocated.template
+@@@warning@@@
+

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- resmgr.conf.template.in	5 Jun 2009 12:54:02 -0000	1.36
+++ resmgr.conf.template.in	13 Dec 2009 18:04:37 -0000	1.37
@@ -4,6 +4,7 @@
 OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
 KOLAB_META_END
 <?php
+@@@warning@@@
 
 /*  
  *  COPYRIGHT

Index: saslauthd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/saslauthd.conf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- saslauthd.conf.template.in	15 Jun 2009 21:16:46 -0000	1.5
+++ saslauthd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.6
@@ -10,9 +10,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+@@@warning@@@
 
 ldap_servers: @@@user_ldap_uri@@@
 #ldap_servers: <ldap://localhost/>

Index: session_vars.php.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- session_vars.php.template.in	6 Mar 2008 11:47:54 -0000	1.6
+++ session_vars.php.template.in	13 Dec 2009 18:04:37 -0000	1.7
@@ -4,6 +4,8 @@
 OWNERSHIP=@webserver_musr@:@kolab_grp@
 KOLAB_META_END
 <?php
+@@@warning@@@
+
 /*
 # (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>

Index: slapd.access.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.access.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- slapd.access.template.in	13 Dec 2009 15:19:23 -0000	1.2
+++ slapd.access.template.in	13 Dec 2009 18:04:37 -0000	1.3
@@ -10,6 +10,8 @@
 ## This program is Free Software under the GNU General Public License (>=v2).
 ## Read the file COPYING that comes with this packages for details.
 
+@@@warning@@@
+
 # Domain ACL statements for inclusion in slapd.conf
 @@@print getLDAPAccess()@@@
 

Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- slapd.conf.template.in	13 Dec 2009 15:19:23 -0000	1.29
+++ slapd.conf.template.in	13 Dec 2009 18:04:37 -0000	1.30
@@ -10,9 +10,7 @@
 # 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 automatically written by the Kolab config backend and should have the 
-# file mode 0640
+@@@warning@@@
 
 @@@if ldapserver_modulepath@@@
 modulepath     @@@ldapserver_modulepath@@@

Index: slapd.replicas.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.replicas.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- slapd.replicas.template.in	13 Dec 2009 15:19:23 -0000	1.4
+++ slapd.replicas.template.in	13 Dec 2009 18:04:37 -0000	1.5
@@ -10,8 +10,7 @@
 ## This program is Free Software under the GNU General Public License (>=v2).
 ## Read the file COPYING that comes with this packages for details.
 
-# manual additions are lost unless made to the template in the Kolab config directory
-# the template is  @sysconfdir@/kolab/templates/slapd.replicas.template
+@@@warning@@@
 
 # Replica statements for inclusion in slapd.conf
 @@@print getLDAPReplicas()@@@

Index: transport.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/transport.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- transport.template.in	13 Dec 2009 15:19:23 -0000	1.8
+++ transport.template.in	13 Dec 2009 18:04:37 -0000	1.9
@@ -9,9 +9,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/transport.template
+@@@warning@@@
+
 @@@print getPostfixMap(transport)@@@
 

Index: virtual.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/virtual.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- virtual.template.in	13 Dec 2009 15:19:23 -0000	1.8
+++ virtual.template.in	13 Dec 2009 18:04:37 -0000	1.9
@@ -9,9 +9,7 @@
 # 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 automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config
-# directory
-# The template is  @sysconfdir@/kolab/templates/virtual.template
+@@@warning@@@
+
 @@@print getPostfixMap(virtual)@@@
 





More information about the commits mailing list