summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2009-03-17 13:15:16 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2009-03-17 13:15:16 (GMT)
commit40ac02617097436c6968b52ef69661308e55d748 (patch)
tree37726dbd81fc242df35ed4c04ff89a37a9921d75
parent7c9bd6a38bc377a3c904d079f8738fdfd319a09d (diff)
downloadkolab-conf-40ac02617097436c6968b52ef69661308e55d748.tar.gz
Use RUNONCHANGE mechanism to restart or reload apache, amavisd and clamav.
This finishes the transition of all easy targets to RUNONCHANGE as mentioned in kolab/issue1679 ([kolabconf] Update template META mechanism to support service restarts)
-rw-r--r--conf/templates/amavisd.conf.template.in1
-rw-r--r--conf/templates/clamd.conf.template.in1
-rw-r--r--conf/templates/httpd.conf.template.in1
-rw-r--r--conf/templates/httpd.local.template.in1
-rw-r--r--conf/templates/php.ini.template.in1
5 files changed, 5 insertions, 0 deletions
diff --git a/conf/templates/amavisd.conf.template.in b/conf/templates/amavisd.conf.template.in
index fe1b9d9..b51ada3 100644
--- a/conf/templates/amavisd.conf.template.in
+++ b/conf/templates/amavisd.conf.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@amavisd_conffile@
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
diff --git a/conf/templates/clamd.conf.template.in b/conf/templates/clamd.conf.template.in
index dfc6b7a..ee256da 100644
--- a/conf/templates/clamd.conf.template.in
+++ b/conf/templates/clamd.conf.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@clamav_confdir@/clamd.conf
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
diff --git a/conf/templates/httpd.conf.template.in b/conf/templates/httpd.conf.template.in
index b95f6be..a050c9e 100644
--- a/conf/templates/httpd.conf.template.in
+++ b/conf/templates/httpd.conf.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@webserver_confdir@/apache.conf
PERMISSIONS=0640
OWNERSHIP=@webserver_usr@:@webserver_grp@
+RUNONCHANGE=@KOLABRC@ rc apache reload
KOLAB_META_END
# (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
# (c) 2003 Martin Konold <martin.konold@erfrakon.de>
diff --git a/conf/templates/httpd.local.template.in b/conf/templates/httpd.local.template.in
index f9c5fd0..c4db823 100644
--- a/conf/templates/httpd.local.template.in
+++ b/conf/templates/httpd.local.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@webserver_confdir@/apache.local
PERMISSIONS=0640
OWNERSHIP=@webserver_musr@:@webserver_grp@
+RUNONCHANGE=@KOLABRC@ rc apache reload
KOLAB_META_END
# (c) 2004 Martin Konold <martin.konold@erfrakon.de>
# This program is Free Software under the GNU General Public License (>=v2).
diff --git a/conf/templates/php.ini.template.in b/conf/templates/php.ini.template.in
index 1f68560..b030031 100644
--- a/conf/templates/php.ini.template.in
+++ b/conf/templates/php.ini.template.in
@@ -2,6 +2,7 @@ KOLAB_META_START
TARGET=@phpini_dir@/php.ini
PERMISSIONS=0640
OWNERSHIP=@webserver_musr@:@webserver_grp@
+RUNONCHANGE=@KOLABRC@ rc apache reload
KOLAB_META_END
;;
;; php.ini -- PHP Configuration