Fix dependency loop in mirror_health when a service is set to absent: the file need...

[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 a9b5206..9e939d7 100644 (file)
--- a/modules/syslog_ng/manifests/init.pp
+++ b/modules/syslog_ng/manifests/init.pp
@@ -3,6 +3,9 @@ class syslog_ng {
                ensure => installed
        }
 
+       $query = 'nodes[certname] { resources { type = "Class" and title = "Roles::Loghost" } }'
+       $loghosts = sort(puppetdb_query($query).map |$value| { $value["certname"] })
+
        service { 'syslog-ng':
                ensure => running,
                hasstatus => false,
@@ -23,17 +26,9 @@ 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'],
                }