Revert "force a restart, rather than reload, of syslog-ng"

This reverts commit 9805eb7834e0280332b5f41ca01a24a9c495f670.

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 032c8bed4fdbe27119fa0e6455e0b638712838e3..5edef0db38e1cf01086d5b1fc84dd1347f7419e0 100644 (file)
--- 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 4e5c26f620f08adecb6261b3e1454f6a209ac2d9..f21ccc5f6fc01d524293992118ddaaff2e177549 100644 (file)
--- a/templates/syslog-ng.conf.erb
+++ b/templates/syslog-ng.conf.erb
@@ -455,5 +455,3 @@ log {
        destination(loghost-paganini);
 };
 <%end%>
-
-