summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-09-21 03:48:08 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-09-21 03:48:08 (GMT)
commit5dc97f6bbaf18a75273c7f66e0ad6792eabe072c (patch)
treebb877a12205f172fc817bf1d9640dc50c4f40ccf
parent5dae11720767c5955683c03b430e89c0b9b20315 (diff)
downloadkolab-conf-5dc97f6bbaf18a75273c7f66e0ad6792eabe072c.tar.gz
Remove dist_conf from the clamav and the simple postfix templates.
-rw-r--r--conf/kolab.globals.in10
-rw-r--r--conf/templates/canonical.template (renamed from conf/templates/canonical.template.in)6
-rw-r--r--conf/templates/clamd.conf.template (renamed from conf/templates/clamd.conf.template.in)16
-rw-r--r--conf/templates/freshclam.conf.template (renamed from conf/templates/freshclam.conf.template.in)12
-rw-r--r--conf/templates/header_checks.template (renamed from conf/templates/header_checks.template.in)4
-rw-r--r--conf/templates/ldapdistlist.cf.template (renamed from conf/templates/ldapdistlist.cf.template.in)4
-rw-r--r--conf/templates/ldaptransport.cf.template (renamed from conf/templates/ldaptransport.cf.template.in)6
-rw-r--r--conf/templates/ldapvirtual.cf.template (renamed from conf/templates/ldapvirtual.cf.template.in)4
-rw-r--r--conf/templates/relocated.template (renamed from conf/templates/relocated.template.in)6
-rw-r--r--conf/templates/transport.template (renamed from conf/templates/transport.template.in)6
-rw-r--r--conf/templates/virtual.template (renamed from conf/templates/virtual.template.in)6
11 files changed, 45 insertions, 35 deletions
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index 553d79c..dd12686 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -18,6 +18,14 @@ bind_any : TRUE
bindir: @bindir@
calendar_id : calendar
conn_refresh_period : 60
+clamav_confdir : @clamav_confdir@
+clamav_socket : @clamav_socket@
+clamav_logfile : @clamav_logfile@
+clamav_pidfile : @clamav_pidfile@
+clamav_datadir : @clamav_datadir@
+clamav_rusr : @clamav_rusr@
+clamav_usr : @clamav_usr@
+clamav_grp : @clamav_grp@
cyrus-admin : manager
cyrus-admins : manager
cyrus-autocreatequota : 100000
@@ -48,6 +56,8 @@ freebusy_log_name: @freebusy_log_name@
freebusy_log_type: @freebusy_log_type@
freebusy_logdir: @freebusy_logdir@
freebusy_usr: @freebusy_usr@
+freshclam_logfile : @freshclam_logfile@
+freshclam_pidfile : @freshclam_pidfile@
graveyard_tscache: @graveyard_tscache@
graveyard_uidcache: @graveyard_uidcache@
gyard_deletion_period : 10080
diff --git a/conf/templates/canonical.template.in b/conf/templates/canonical.template
index 1d5f9ae..81cd6d6 100644
--- a/conf/templates/canonical.template.in
+++ b/conf/templates/canonical.template
@@ -1,8 +1,8 @@
KOLAB_META_START
-TARGET=@emailserver_confdir@/canonical
+TARGET=@@@emailserver_confdir@@@/canonical
PERMISSIONS=0640
-OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/canonical
+OWNERSHIP=@@@emailserver_tables_usr@@@:@@@emailserver_grp@@@
+RUNONCHANGE=@@@sbindir@@@/postmap -o @@@emailserver_confdir@@@/canonical
KOLAB_META_END
# (c) 2008 Mathieu Parent <math.parent@gmail.com>
# This program is Free Software under the GNU General Public License (>=v2).
diff --git a/conf/templates/clamd.conf.template.in b/conf/templates/clamd.conf.template
index cf12ce4..0779c5b 100644
--- a/conf/templates/clamd.conf.template.in
+++ b/conf/templates/clamd.conf.template
@@ -1,8 +1,8 @@
KOLAB_META_START
-TARGET=@clamav_confdir@/clamd.conf
+TARGET=@@@clamav_confdir@@@/clamd.conf
PERMISSIONS=0640
-OWNERSHIP=@clamav_usr@:@clamav_grp@
-RUNONCHANGE=@KOLABRC@ rc clamav restart
+OWNERSHIP=@@@clamav_usr@@@:@@@clamav_grp@@@
+RUNONCHANGE=@@@KOLABRC@@@ rc clamav restart
KOLAB_META_END
@@@warning@@@
@@ -19,7 +19,7 @@ KOLAB_META_END
# LogFile must be writable for the user running daemon.
# A full path is required.
# Default: disabled
-LogFile @clamav_logfile@
+LogFile @@@clamav_logfile@@@
# By default the log file is locked for writing - the lock protects against
# running clamd multiple times (if want to run another clamd, please
@@ -62,7 +62,7 @@ LogTime yes
# This option allows you to save a process identifier of the listening
# daemon (main thread).
# Default: disabled
-PidFile @clamav_pidfile@
+PidFile @@@clamav_pidfile@@@
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@ -70,14 +70,14 @@ PidFile @clamav_pidfile@
# Path to the database directory.
# Default: hardcoded (depends on installation options)
-DatabaseDirectory @clamav_datadir@
+DatabaseDirectory @@@clamav_datadir@@@
# The daemon can work in local mode, network mode or both.
# Due to security reasons we recommend the local mode.
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
-LocalSocket @clamav_socket@
+LocalSocket @@@clamav_socket@@@
# Remove stale socket after unclean shutdown.
# Default: yes
@@ -175,7 +175,7 @@ FixStaleSocket yes
# Run as another user (clamd must be started by root for this option to work)
# Default: don't drop privileges
-User @clamav_rusr@
+User @@@clamav_rusr@@@
# Initialize supplementary group access (clamd must be started by root).
# Default: no
diff --git a/conf/templates/freshclam.conf.template.in b/conf/templates/freshclam.conf.template
index 0a48b10..3d0bdb8 100644
--- a/conf/templates/freshclam.conf.template.in
+++ b/conf/templates/freshclam.conf.template
@@ -1,7 +1,7 @@
KOLAB_META_START
-TARGET=@clamav_confdir@/freshclam.conf
+TARGET=@@@clamav_confdir@@@/freshclam.conf
PERMISSIONS=0640
-OWNERSHIP=@clamav_usr@:@clamav_grp@
+OWNERSHIP=@@@clamav_usr@@@:@@@clamav_grp@@@
KOLAB_META_END
@@@warning@@@
@@ -17,11 +17,11 @@ KOLAB_META_END
# Path to the database directory.
# WARNING: It must match clamd.conf's directive!
# Default: hardcoded (depends on installation options)
-DatabaseDirectory @clamav_datadir@
+DatabaseDirectory @@@clamav_datadir@@@
# Path to the log file (make sure it has proper permissions)
# Default: disabled
-UpdateLogFile @freshclam_logfile@
+UpdateLogFile @@@freshclam_logfile@@@
# Maximum size of the log file.
# Value of 0 disables the limit.
@@ -50,7 +50,7 @@ UpdateLogFile @freshclam_logfile@
# This option allows you to save the process identifier of the daemon
# Default: disabled
-#PidFile @freshclam_pidfile@
+#PidFile @@@freshclam_pidfile@@@
# By default when started freshclam drops privileges and switches to the
# "clamav" user. This directive allows you to change the database owner.
@@ -118,7 +118,7 @@ DatabaseMirror database.clamav.net
# Send the RELOAD command to clamd.
# Default: no
-NotifyClamd @clamav_confdir@/clamd.conf
+NotifyClamd @@@clamav_confdir@@@/clamd.conf
# Run command after successful database update.
# Default: disabled
diff --git a/conf/templates/header_checks.template.in b/conf/templates/header_checks.template
index 0dbddc8..6274834 100644
--- a/conf/templates/header_checks.template.in
+++ b/conf/templates/header_checks.template
@@ -1,7 +1,7 @@
KOLAB_META_START
-TARGET=@emailserver_confdir@/header_checks
+TARGET=@@@emailserver_confdir@@@/header_checks
PERMISSIONS=0640
-OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
+OWNERSHIP=@@@emailserver_tables_usr@@@:@@@emailserver_grp@@@
KOLAB_META_END
@@@warning@@@
diff --git a/conf/templates/ldapdistlist.cf.template.in b/conf/templates/ldapdistlist.cf.template
index c3252dc..93f71fb 100644
--- a/conf/templates/ldapdistlist.cf.template.in
+++ b/conf/templates/ldapdistlist.cf.template
@@ -1,7 +1,7 @@
KOLAB_META_START
-TARGET=@emailserver_confdir@/ldapdistlist.cf
+TARGET=@@@emailserver_confdir@@@/ldapdistlist.cf
PERMISSIONS=0640
-OWNERSHIP=@emailserver_usr@:@emailserver_grp@
+OWNERSHIP=@@@emailserver_usr@@@:@@@emailserver_grp@@@
KOLAB_META_END
# (c) 2005 Steffen Hansen <steffen@klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
#
diff --git a/conf/templates/ldaptransport.cf.template.in b/conf/templates/ldaptransport.cf.template
index fa54f22..29d3154 100644
--- a/conf/templates/ldaptransport.cf.template.in
+++ b/conf/templates/ldaptransport.cf.template
@@ -1,8 +1,8 @@
KOLAB_META_START
-TARGET=@emailserver_confdir@/ldaptransport.cf
+TARGET=@@@emailserver_confdir@@@/ldaptransport.cf
PERMISSIONS=0640
-OWNERSHIP=@emailserver_usr@:@emailserver_grp@
-RUNONCHANGE=@KOLABRC@ rc postfix reload
+OWNERSHIP=@@@emailserver_usr@@@:@@@emailserver_grp@@@
+RUNONCHANGE=@@@KOLABRC@@@ rc postfix reload
KOLAB_META_END
# (c) 2005 Steffen Hansen <steffen@klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
#
diff --git a/conf/templates/ldapvirtual.cf.template.in b/conf/templates/ldapvirtual.cf.template
index dd26863..57f1d05 100644
--- a/conf/templates/ldapvirtual.cf.template.in
+++ b/conf/templates/ldapvirtual.cf.template
@@ -1,7 +1,7 @@
KOLAB_META_START
-TARGET=@emailserver_confdir@/ldapvirtual.cf
+TARGET=@@@emailserver_confdir@@@/ldapvirtual.cf
PERMISSIONS=0640
-OWNERSHIP=@emailserver_usr@:@emailserver_grp@
+OWNERSHIP=@@@emailserver_usr@@@:@@@emailserver_grp@@@
KOLAB_META_END
# (c) 2005 Steffen Hansen <steffen@klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
#
diff --git a/conf/templates/relocated.template.in b/conf/templates/relocated.template
index b4df734..087057d 100644
--- a/conf/templates/relocated.template.in
+++ b/conf/templates/relocated.template
@@ -1,8 +1,8 @@
KOLAB_META_START
-TARGET=@emailserver_confdir@/relocated
+TARGET=@@@emailserver_confdir@@@/relocated
PERMISSIONS=0640
-OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/relocated
+OWNERSHIP=@@@emailserver_tables_usr@@@:@@@emailserver_grp@@@
+RUNONCHANGE=@@@sbindir@@@/postmap -o @@@emailserver_confdir@@@/relocated
KOLAB_META_END
# (c) 2008 Mathieu Parent <math.parent@gmail.com>
# This program is Free Software under the GNU General Public License (>=v2).
diff --git a/conf/templates/transport.template.in b/conf/templates/transport.template
index 173c6ab..11024ca 100644
--- a/conf/templates/transport.template.in
+++ b/conf/templates/transport.template
@@ -1,8 +1,8 @@
KOLAB_META_START
-TARGET=@emailserver_confdir@/transport
+TARGET=@@@emailserver_confdir@@@/transport
PERMISSIONS=0640
-OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/transport
+OWNERSHIP=@@@emailserver_tables_usr@@@:@@@emailserver_grp@@@
+RUNONCHANGE=@@@sbindir@@@/postmap -o @@@emailserver_confdir@@@/transport
KOLAB_META_END
# (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
# (c) 2003 Martin Konold <martin.konold@erfrakon.de>
diff --git a/conf/templates/virtual.template.in b/conf/templates/virtual.template
index 82dd15d..0fdb84d 100644
--- a/conf/templates/virtual.template.in
+++ b/conf/templates/virtual.template
@@ -1,8 +1,8 @@
KOLAB_META_START
-TARGET=@emailserver_confdir@/virtual
+TARGET=@@@emailserver_confdir@@@/virtual
PERMISSIONS=0640
-OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
-RUNONCHANGE=@sbindir@/postmap -o @emailserver_confdir@/virtual
+OWNERSHIP=@@@emailserver_tables_usr@@@:@@@emailserver_grp@@@
+RUNONCHANGE=@@@sbindir@@@/postmap -o @@@emailserver_confdir@@@/virtual
KOLAB_META_END
# (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
# (c) 2003 Martin Konold <martin.konold@erfrakon.de>