fix munin 1

[mirror/dsa-puppet.git] / modules / syslog-ng / manifests / init.pp

diff --git a/modules/syslog-ng/manifests/init.pp b/modules/syslog-ng/manifests/init.pp
index b1490d9..c55b687 100644 (file)
--- a/modules/syslog-ng/manifests/init.pp
+++ b/modules/syslog-ng/manifests/init.pp
@@ -1,30 +1,46 @@
 class syslog-ng {
-    package {
-        "syslog-ng": ensure => installed;
-    }
+       package { 'syslog-ng':
+               ensure => installed
+       }
 
-    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/default/syslog-ng":
-            require => Package["syslog-ng"],
-            source => "puppet:///modules/syslog-ng/syslog-ng.default",
-            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;
-    }
+       service { 'syslog-ng':
+               ensure => running,
+               hasstatus => false,
+               pattern   => 'syslog-ng',
+       }
+
+       file { '/etc/syslog-ng/syslog-ng.conf':
+               content => template('syslog-ng/syslog-ng.conf.erb'),
+               require => Package['syslog-ng'],
+               notify  => Service['syslog-ng']
+       }
+       file { '/etc/default/syslog-ng':
+               source  => 'puppet:///modules/syslog-ng/syslog-ng.default',
+               require => Package['syslog-ng'],
+               notify  => Service['syslog-ng']
+       }
+       file { '/etc/logrotate.d/syslog-ng':
+               source  => 'puppet:///modules/syslog-ng/syslog-ng.logrotate',
+               require => Package['syslog-ng']
+       }
+       if $::hostname in [lotty,lully,loghost-grnet-01] {
+               file { '/etc/logrotate.d/syslog-ng-loggers':
+                       source  => 'puppet:///modules/syslog-ng/syslog-ng.logrotate.loggers',
+                       require => Package['syslog-ng']
+               }
+       }
+       # while syslog-ng breaks on boot
+
+       if $systemd {
+               file { '/etc/systemd/system/syslog-ng.service':
+                       ensure => $servicefiles,
+                       source => 'puppet:///modules/syslog-ng/syslog-ng.service',
+                       notify => Exec['systemctl daemon-reload'],
+               }
+
+               file { '/etc/systemd/system/syslog.service':
+                       ensure => absent,
+                       notify => Exec['systemctl daemon-reload'],
+               }
+       }
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: