summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Parent <math.parent@gmail.com>2009-12-13 15:19:23 (GMT)
committerMathieu Parent <math.parent@gmail.com>2009-12-13 15:19:23 (GMT)
commitddba461968fe691734193eefc808aa8a32e2670f (patch)
tree66db34d449421c3789c4c59eaa6f51fb69c57c1e
parent0b3fec6b9fa29f4142dec064d605d2adccd0bbed (diff)
downloadkolab-conf-ddba461968fe691734193eefc808aa8a32e2670f.tar.gz
perl-kolab:
new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(), getCyrusGroups(), getPostfixMap(map). This removed the use of %special_templates, %haschanged, Kolab::Conf::reload(). kolabd: kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport, virtual and imapd.groups by templates) using the new @@@print@@@ macro (perl-kolab) and RUNONCHANGE.
-rw-r--r--conf/templates/DB_CONFIG.slapd.template.in1
-rw-r--r--conf/templates/access.template.in1
-rw-r--r--conf/templates/imapd.group.template.in1
-rw-r--r--conf/templates/slapd.access.template.in2
-rw-r--r--conf/templates/slapd.conf.template.in1
-rw-r--r--conf/templates/slapd.replicas.template.in2
-rw-r--r--conf/templates/transport.template.in2
-rw-r--r--conf/templates/virtual.template.in1
8 files changed, 11 insertions, 0 deletions
diff --git a/conf/templates/DB_CONFIG.slapd.template.in b/conf/templates/DB_CONFIG.slapd.template.in
index f95bcbe..c67d6c3 100644
--- a/conf/templates/DB_CONFIG.slapd.template.in
+++ b/conf/templates/DB_CONFIG.slapd.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@ldapserver_dir@/DB_CONFIG
PERMISSIONS=0640
OWNERSHIP=@ldapserver_usr@:@ldapserver_rgrp@
+RUNONCHANGE=@KOLABRC@ rc openldap restart
KOLAB_META_END
# (c) 2005 Klaraelvdalens Datakonsult AB
# Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
diff --git a/conf/templates/access.template.in b/conf/templates/access.template.in
index 2d85d3d..dd3d4b9 100644
--- a/conf/templates/access.template.in
+++ b/conf/templates/access.template.in
@@ -12,3 +12,4 @@ KOLAB_META_END
# manual additions are lost unless made to the template in the Kolab config
# directory
# The template is @sysconfdir@/kolab/templates/access.template
+
diff --git a/conf/templates/imapd.group.template.in b/conf/templates/imapd.group.template.in
index 74c6c11..e457d74 100644
--- a/conf/templates/imapd.group.template.in
+++ b/conf/templates/imapd.group.template.in
@@ -9,4 +9,5 @@ KOLAB_META_END
## Read the file COPYING that comes with this packages for details.
# gid's over 60000 are reserved for LDAP groups !
+@@@print getCyrusGroups()@@@
diff --git a/conf/templates/slapd.access.template.in b/conf/templates/slapd.access.template.in
index 934974f..7e4af26 100644
--- a/conf/templates/slapd.access.template.in
+++ b/conf/templates/slapd.access.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@ldapserver_confdir@/slapd.access
PERMISSIONS=0640
OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
+RUNONCHANGE=@KOLABRC@ rc openldap restart
KOLAB_META_END
## Copyright (c) 2005 Klaraelvdalens Datakonsult AB
## Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
@@ -10,4 +11,5 @@ KOLAB_META_END
## Read the file COPYING that comes with this packages for details.
# 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 6282807..bc3d2c6 100644
--- a/conf/templates/slapd.conf.template.in
+++ b/conf/templates/slapd.conf.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@ldapserver_confdir@/slapd.conf
PERMISSIONS=0640
OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
+RUNONCHANGE=@KOLABRC@ rc openldap restart
KOLAB_META_END
# (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
# (c) 2003-2007 Martin Konold <martin.konold@erfrakon.de>
diff --git a/conf/templates/slapd.replicas.template.in b/conf/templates/slapd.replicas.template.in
index 1209335..637a3ee 100644
--- a/conf/templates/slapd.replicas.template.in
+++ b/conf/templates/slapd.replicas.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@ldapserver_confdir@/slapd.replicas
PERMISSIONS=0640
OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
+RUNONCHANGE=@KOLABRC@ rc openldap restart
KOLAB_META_END
## Copyright (c) 2004 Klaraelvdalens Datakonsult AB
## Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
@@ -13,4 +14,5 @@ KOLAB_META_END
# the template is @sysconfdir@/kolab/templates/slapd.replicas.template
# Replica statements for inclusion in slapd.conf
+@@@print getLDAPReplicas()@@@
diff --git a/conf/templates/transport.template.in b/conf/templates/transport.template.in
index 1800399..fd963eb 100644
--- a/conf/templates/transport.template.in
+++ b/conf/templates/transport.template.in
@@ -13,3 +13,5 @@ KOLAB_META_END
# manual additions are lost unless made to the template in the Kolab config
# directory
# The template is @sysconfdir@/kolab/templates/transport.template
+@@@print getPostfixMap(transport)@@@
+
diff --git a/conf/templates/virtual.template.in b/conf/templates/virtual.template.in
index af92619..65d53a7 100644
--- a/conf/templates/virtual.template.in
+++ b/conf/templates/virtual.template.in
@@ -13,4 +13,5 @@ KOLAB_META_END
# manual additions are lost unless made to the template in the Kolab config
# directory
# The template is @sysconfdir@/kolab/templates/virtual.template
+@@@print getPostfixMap(virtual)@@@