From b3f915434eb31aef5a7730178c1c3b608a011059 Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Mon, 13 Sep 2010 18:30:51 +0100
Subject: [PATCH] make new syslog-ng module

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 manifests/site.pp                             |  1 +
 modules/debian-org/manifests/init.pp          | 12 -----------
 .../syslog-ng/files/syslog-ng.logrotate       |  0
 modules/syslog-ng/manifests/init.pp           | 21 +++++++++++++++++++
 .../syslog-ng/templates}/syslog-ng.conf.erb   |  0
 5 files changed, 22 insertions(+), 12 deletions(-)
 rename files/etc/logrotate.d/syslog-ng => modules/syslog-ng/files/syslog-ng.logrotate (100%)
 create mode 100644 modules/syslog-ng/manifests/init.pp
 rename {templates => modules/syslog-ng/templates}/syslog-ng.conf.erb (100%)

diff --git a/manifests/site.pp b/manifests/site.pp
index 22e773d18..564d270fc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -22,6 +22,7 @@ node default {
     notice("hoster for ${fqdn} is ${hoster}")
 
     include munin-node
+    include syslog-ng
     include sudo
     include ssh
     include debian-org
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 5edef0db3..7af2230d9 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -80,15 +80,6 @@ class debian-org {
             source => "puppet:///files/etc/default/puppet"
             ;
        
-        "/etc/syslog-ng/syslog-ng.conf":
-            content => template("syslog-ng.conf.erb"),
-            require => Package["syslog-ng"],
-            notify  => Exec["syslog-ng reload"],
-            ;
-        "/etc/logrotate.d/syslog-ng":
-            require => Package["syslog-ng"],
-            source => "puppet:///files/etc/logrotate.d/syslog-ng",
-            ;
         "/etc/cron.d/dsa-puppet-stuff":
             source => "puppet:///files/etc/cron.d/dsa-puppet-stuff",
             require => Package["cron"]
@@ -128,9 +119,6 @@ class debian-org {
     }
    
     exec {
-        "syslog-ng reload":
-            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-            refreshonly => true;
         "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
             path        => "/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true;
diff --git a/files/etc/logrotate.d/syslog-ng b/modules/syslog-ng/files/syslog-ng.logrotate
similarity index 100%
rename from files/etc/logrotate.d/syslog-ng
rename to modules/syslog-ng/files/syslog-ng.logrotate
diff --git a/modules/syslog-ng/manifests/init.pp b/modules/syslog-ng/manifests/init.pp
new file mode 100644
index 000000000..1960bdb4a
--- /dev/null
+++ b/modules/syslog-ng/manifests/init.pp
@@ -0,0 +1,21 @@
+class syslog-ng {
+    file {
+        "/etc/syslog-ng/syslog-ng.conf":
+            content => template("syslog-ng/syslog-ng.conf.erb"),
+            require => Package["syslog-ng"],
+            notify  => Exec["syslog-ng reload"],
+            ;
+        "/etc/logrotate.d/syslog-ng":
+            require => Package["syslog-ng"],
+            source => "puppet:///modules/syslog-ng/syslog-ng.logrotate",
+            ;
+    }
+    exec {
+        "syslog-ng reload":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true;
+    }
+}
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
diff --git a/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
similarity index 100%
rename from templates/syslog-ng.conf.erb
rename to modules/syslog-ng/templates/syslog-ng.conf.erb
-- 
2.20.1