X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Fmanifests%2Finit.pp;h=c55b6876bee196182499c1db3746036c90ba4e8a;hb=d5860b0cc2d81d2332b8035b1a279a7fafda4890;hp=5b5518b7d107868bb18ec71d3b78e3c253b514e5;hpb=132ca45393a7d7fe277a5eb391e211d2c1775d24;p=mirror%2Fdsa-puppet.git diff --git a/modules/syslog-ng/manifests/init.pp b/modules/syslog-ng/manifests/init.pp index 5b5518b7d..c55b6876b 100644 --- a/modules/syslog-ng/manifests/init.pp +++ b/modules/syslog-ng/manifests/init.pp @@ -4,7 +4,7 @@ class syslog-ng { } service { 'syslog-ng': - ensure => running + ensure => running, hasstatus => false, pattern => 'syslog-ng', } @@ -23,4 +23,24 @@ class 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'], + } + } }