From c7241fdd5a581b761c7f8851a8bd8d9245c84d9c Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 20 Jun 2010 07:12:30 +0000 Subject: [PATCH] Revert "force a restart, rather than reload, of syslog-ng" This reverts commit 9805eb7834e0280332b5f41ca01a24a9c495f670. --- modules/debian-org/manifests/init.pp | 4 ++-- templates/syslog-ng.conf.erb | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 032c8bed..5edef0db 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -83,7 +83,7 @@ class debian-org { "/etc/syslog-ng/syslog-ng.conf": content => template("syslog-ng.conf.erb"), require => Package["syslog-ng"], - notify => Exec["syslog-ng restart"], + notify => Exec["syslog-ng reload"], ; "/etc/logrotate.d/syslog-ng": require => Package["syslog-ng"], @@ -128,7 +128,7 @@ class debian-org { } exec { - "syslog-ng restart": + "syslog-ng reload": path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", refreshonly => true; "dpkg-reconfigure tzdata -pcritical -fnoninteractive": diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb index 4e5c26f6..f21ccc5f 100644 --- a/templates/syslog-ng.conf.erb +++ b/templates/syslog-ng.conf.erb @@ -455,5 +455,3 @@ log { destination(loghost-paganini); }; <%end%> - - -- 2.39.2