X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog_ng%2Fmanifests%2Finit.pp;h=9e939d7770e9c27b6f75eae5775aa967afbd672d;hb=dadd310402bb0fe101164395dcb22deb064b35a1;hp=a9b520673cfa205ba0ae2173f18068de14ee5847;hpb=249b713a08d35bffb1cd52739be6f5808baa5a5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog_ng/manifests/init.pp b/modules/syslog_ng/manifests/init.pp
index a9b520673..9e939d777 100644
--- 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'],
 		}