summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Parent <math.parent@gmail.com>2009-12-13 18:04:37 (GMT)
committerMathieu Parent <math.parent@gmail.com>2009-12-13 18:04:37 (GMT)
commit2b3bd8afcc0d43036b4b9d0ccd2613ecd672c65c (patch)
tree01cf34dd7da397d583c9f368d11585360f3dec1f
parentddba461968fe691734193eefc808aa8a32e2670f (diff)
downloadkolab-conf-2b3bd8afcc0d43036b4b9d0ccd2613ecd672c65c.tar.gz
kolab/issue1671 (Improving the warning about kolab templates within
configuration files)
-rw-r--r--conf/templates/DB_CONFIG.slapd.template.in3
-rw-r--r--conf/templates/access.template.in5
-rw-r--r--conf/templates/amavisd.conf.template.in3
-rw-r--r--conf/templates/canonical.template.in6
-rw-r--r--conf/templates/clamd.conf.template.in4
-rw-r--r--conf/templates/cyrus.conf.template.in4
-rw-r--r--conf/templates/freebusy.conf.template.in1
-rw-r--r--conf/templates/freshclam.conf.template.in4
-rw-r--r--conf/templates/header_checks.template.in5
-rw-r--r--conf/templates/httpd.conf.template.in3
-rw-r--r--conf/templates/httpd.local.template.in4
-rw-r--r--conf/templates/imapd.conf.template.in5
-rw-r--r--conf/templates/imapd.group.template.in2
-rw-r--r--conf/templates/kolab_smtpdpolicy.conf.template.in3
-rw-r--r--conf/templates/ldap.conf.template.in5
-rw-r--r--conf/templates/ldapdistlist.cf.template.in4
-rw-r--r--conf/templates/ldaptransport.cf.template.in3
-rw-r--r--conf/templates/ldapvirtual.cf.template.in3
-rw-r--r--conf/templates/local.cf.template.in6
-rw-r--r--conf/templates/main.cf.template.in4
-rw-r--r--conf/templates/master.cf.template.in4
-rw-r--r--conf/templates/php.ini.template.in3
-rw-r--r--conf/templates/rc.conf.template.in3
-rw-r--r--conf/templates/relocated.template.in6
-rw-r--r--conf/templates/resmgr.conf.template.in1
-rw-r--r--conf/templates/saslauthd.conf.template.in4
-rw-r--r--conf/templates/session_vars.php.template.in2
-rw-r--r--conf/templates/slapd.access.template.in2
-rw-r--r--conf/templates/slapd.conf.template.in4
-rw-r--r--conf/templates/slapd.replicas.template.in3
-rw-r--r--conf/templates/transport.template.in6
-rw-r--r--conf/templates/virtual.template.in6
32 files changed, 44 insertions, 77 deletions
diff --git a/conf/templates/DB_CONFIG.slapd.template.in b/conf/templates/DB_CONFIG.slapd.template.in
index c67d6c3..e85a8c1 100644
--- a/conf/templates/DB_CONFIG.slapd.template.in
+++ b/conf/templates/DB_CONFIG.slapd.template.in
@@ -10,8 +10,7 @@ KOLAB_META_END
# 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
diff --git a/conf/templates/access.template.in b/conf/templates/access.template.in
index dd3d4b9..b078d0b 100644
--- a/conf/templates/access.template.in
+++ b/conf/templates/access.template.in
@@ -8,8 +8,5 @@ KOLAB_META_END
# 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@@@
diff --git a/conf/templates/amavisd.conf.template.in b/conf/templates/amavisd.conf.template.in
index d1a600e..d05cd30 100644
--- a/conf/templates/amavisd.conf.template.in
+++ b/conf/templates/amavisd.conf.template.in
@@ -4,8 +4,7 @@ PERMISSIONS=0640
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;
diff --git a/conf/templates/canonical.template.in b/conf/templates/canonical.template.in
index 9abac09..1d5f9ae 100644
--- a/conf/templates/canonical.template.in
+++ b/conf/templates/canonical.template.in
@@ -8,7 +8,5 @@ KOLAB_META_END
# 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@@@
+
diff --git a/conf/templates/clamd.conf.template.in b/conf/templates/clamd.conf.template.in
index d06fe37..cf12ce4 100644
--- a/conf/templates/clamd.conf.template.in
+++ b/conf/templates/clamd.conf.template.in
@@ -4,8 +4,8 @@ PERMISSIONS=0640
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.
diff --git a/conf/templates/cyrus.conf.template.in b/conf/templates/cyrus.conf.template.in
index 2f3025b..cf12c64 100644
--- a/conf/templates/cyrus.conf.template.in
+++ b/conf/templates/cyrus.conf.template.in
@@ -10,9 +10,7 @@ KOLAB_META_END
# 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!
diff --git a/conf/templates/freebusy.conf.template.in b/conf/templates/freebusy.conf.template.in
index cf61659..4474e9e 100644
--- a/conf/templates/freebusy.conf.template.in
+++ b/conf/templates/freebusy.conf.template.in
@@ -4,6 +4,7 @@ PERMISSIONS=0640
OWNERSHIP=@freebusy_usr@:@freebusy_grp@
KOLAB_META_END
<?php
+@@@warning@@@
/*
* COPYRIGHT
diff --git a/conf/templates/freshclam.conf.template.in b/conf/templates/freshclam.conf.template.in
index da3e584..0a48b10 100644
--- a/conf/templates/freshclam.conf.template.in
+++ b/conf/templates/freshclam.conf.template.in
@@ -3,8 +3,8 @@ TARGET=@clamav_confdir@/freshclam.conf
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.
diff --git a/conf/templates/header_checks.template.in b/conf/templates/header_checks.template.in
index e6d7220..0dbddc8 100644
--- a/conf/templates/header_checks.template.in
+++ b/conf/templates/header_checks.template.in
@@ -3,10 +3,7 @@ TARGET=@emailserver_confdir@/header_checks
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
diff --git a/conf/templates/httpd.conf.template.in b/conf/templates/httpd.conf.template.in
index 421f157..cd821ad 100644
--- a/conf/templates/httpd.conf.template.in
+++ b/conf/templates/httpd.conf.template.in
@@ -10,8 +10,7 @@ KOLAB_META_END
# 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@"
diff --git a/conf/templates/httpd.local.template.in b/conf/templates/httpd.local.template.in
index c4db823..d839d42 100644
--- a/conf/templates/httpd.local.template.in
+++ b/conf/templates/httpd.local.template.in
@@ -8,9 +8,7 @@ KOLAB_META_END
# 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
diff --git a/conf/templates/imapd.conf.template.in b/conf/templates/imapd.conf.template.in
index 1b782f4..dff81fa 100644
--- a/conf/templates/imapd.conf.template.in
+++ b/conf/templates/imapd.conf.template.in
@@ -10,10 +10,7 @@ KOLAB_META_END
# 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@
diff --git a/conf/templates/imapd.group.template.in b/conf/templates/imapd.group.template.in
index e457d74..3e182bb 100644
--- a/conf/templates/imapd.group.template.in
+++ b/conf/templates/imapd.group.template.in
@@ -8,6 +8,8 @@ KOLAB_META_END
## 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()@@@
diff --git a/conf/templates/kolab_smtpdpolicy.conf.template.in b/conf/templates/kolab_smtpdpolicy.conf.template.in
index fb42f1f..46dc421 100644
--- a/conf/templates/kolab_smtpdpolicy.conf.template.in
+++ b/conf/templates/kolab_smtpdpolicy.conf.template.in
@@ -8,8 +8,7 @@ KOLAB_META_END
# 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@@@
diff --git a/conf/templates/ldap.conf.template.in b/conf/templates/ldap.conf.template.in
index eec59b9..74214ab 100644
--- a/conf/templates/ldap.conf.template.in
+++ b/conf/templates/ldap.conf.template.in
@@ -7,11 +7,8 @@ KOLAB_META_END
# 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
#
diff --git a/conf/templates/ldapdistlist.cf.template.in b/conf/templates/ldapdistlist.cf.template.in
index f831366..c3252dc 100644
--- a/conf/templates/ldapdistlist.cf.template.in
+++ b/conf/templates/ldapdistlist.cf.template.in
@@ -8,9 +8,7 @@ KOLAB_META_END
# 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
diff --git a/conf/templates/ldaptransport.cf.template.in b/conf/templates/ldaptransport.cf.template.in
index e0cf52d..fa54f22 100644
--- a/conf/templates/ldaptransport.cf.template.in
+++ b/conf/templates/ldaptransport.cf.template.in
@@ -9,8 +9,7 @@ KOLAB_META_END
# 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
diff --git a/conf/templates/ldapvirtual.cf.template.in b/conf/templates/ldapvirtual.cf.template.in
index 41d624d..dd26863 100644
--- a/conf/templates/ldapvirtual.cf.template.in
+++ b/conf/templates/ldapvirtual.cf.template.in
@@ -8,8 +8,7 @@ KOLAB_META_END
# 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
diff --git a/conf/templates/local.cf.template.in b/conf/templates/local.cf.template.in
index ad9cecf..86660b2 100644
--- a/conf/templates/local.cf.template.in
+++ b/conf/templates/local.cf.template.in
@@ -8,10 +8,8 @@ KOLAB_META_END
# 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)
diff --git a/conf/templates/main.cf.template.in b/conf/templates/main.cf.template.in
index 03911aa..9bd9b5d 100644
--- a/conf/templates/main.cf.template.in
+++ b/conf/templates/main.cf.template.in
@@ -11,9 +11,7 @@ KOLAB_META_END
# 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
diff --git a/conf/templates/master.cf.template.in b/conf/templates/master.cf.template.in
index 762b410..4d50ea9 100644
--- a/conf/templates/master.cf.template.in
+++ b/conf/templates/master.cf.template.in
@@ -11,9 +11,7 @@ KOLAB_META_END
# 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
diff --git a/conf/templates/php.ini.template.in b/conf/templates/php.ini.template.in
index a62bc9b..ce7ae7d 100644
--- a/conf/templates/php.ini.template.in
+++ b/conf/templates/php.ini.template.in
@@ -3,7 +3,10 @@ TARGET=@phpini_dir@/php.ini
PERMISSIONS=0640
OWNERSHIP=@webserver_musr@:@webserver_grp@
RUNONCHANGE=@KOLABRC@ rc apache reload
+COMMENT_CHAR=;
KOLAB_META_END
+@@@warning@@@
+
;;
;; php.ini -- PHP Configuration
;;
diff --git a/conf/templates/rc.conf.template.in b/conf/templates/rc.conf.template.in
index 2c7fbcc..be30ada 100644
--- a/conf/templates/rc.conf.template.in
+++ b/conf/templates/rc.conf.template.in
@@ -8,8 +8,7 @@ KOLAB_META_END
# 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"
diff --git a/conf/templates/relocated.template.in b/conf/templates/relocated.template.in
index 3d6f0c1..b4df734 100644
--- a/conf/templates/relocated.template.in
+++ b/conf/templates/relocated.template.in
@@ -8,7 +8,5 @@ KOLAB_META_END
# 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@@@
+
diff --git a/conf/templates/resmgr.conf.template.in b/conf/templates/resmgr.conf.template.in
index 391bf4d..43eb6e4 100644
--- a/conf/templates/resmgr.conf.template.in
+++ b/conf/templates/resmgr.conf.template.in
@@ -4,6 +4,7 @@ PERMISSIONS=0640
OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
KOLAB_META_END
<?php
+@@@warning@@@
/*
* COPYRIGHT
diff --git a/conf/templates/saslauthd.conf.template.in b/conf/templates/saslauthd.conf.template.in
index 21fb81f..11c7de5 100644
--- a/conf/templates/saslauthd.conf.template.in
+++ b/conf/templates/saslauthd.conf.template.in
@@ -10,9 +10,7 @@ KOLAB_META_END
# 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/>
diff --git a/conf/templates/session_vars.php.template.in b/conf/templates/session_vars.php.template.in
index 2fa2d83..7b45161 100644
--- a/conf/templates/session_vars.php.template.in
+++ b/conf/templates/session_vars.php.template.in
@@ -4,6 +4,8 @@ PERMISSIONS=0640
OWNERSHIP=@webserver_musr@:@kolab_grp@
KOLAB_META_END
<?php
+@@@warning@@@
+
/*
# (c) 2005 Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
# (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
diff --git a/conf/templates/slapd.access.template.in b/conf/templates/slapd.access.template.in
index 7e4af26..f1bba36 100644
--- a/conf/templates/slapd.access.template.in
+++ b/conf/templates/slapd.access.template.in
@@ -10,6 +10,8 @@ KOLAB_META_END
## 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()@@@
diff --git a/conf/templates/slapd.conf.template.in b/conf/templates/slapd.conf.template.in
index bc3d2c6..2fc3447 100644
--- a/conf/templates/slapd.conf.template.in
+++ b/conf/templates/slapd.conf.template.in
@@ -10,9 +10,7 @@ KOLAB_META_END
# 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@@@
diff --git a/conf/templates/slapd.replicas.template.in b/conf/templates/slapd.replicas.template.in
index 637a3ee..853eea8 100644
--- a/conf/templates/slapd.replicas.template.in
+++ b/conf/templates/slapd.replicas.template.in
@@ -10,8 +10,7 @@ KOLAB_META_END
## 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()@@@
diff --git a/conf/templates/transport.template.in b/conf/templates/transport.template.in
index fd963eb..173c6ab 100644
--- a/conf/templates/transport.template.in
+++ b/conf/templates/transport.template.in
@@ -9,9 +9,7 @@ KOLAB_META_END
# 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)@@@
diff --git a/conf/templates/virtual.template.in b/conf/templates/virtual.template.in
index 65d53a7..82dd15d 100644
--- a/conf/templates/virtual.template.in
+++ b/conf/templates/virtual.template.in
@@ -9,9 +9,7 @@ KOLAB_META_END
# 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)@@@