X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog_ng%2Fmanifests%2Finit.pp;h=9e939d7770e9c27b6f75eae5775aa967afbd672d;hb=067090ebb5aafec7408e2a0676b857f8235ecbfc;hp=3489fb474c9a9a4f4998595805d821905f236e8e;hpb=6fd3b90b696fc0e8e466973e20eb6bd7a83ab2f2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog_ng/manifests/init.pp b/modules/syslog_ng/manifests/init.pp
index 3489fb474..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,20 +26,6 @@ class syslog_ng {
 		source  => 'puppet:///modules/syslog_ng/syslog-ng.logrotate',
 		require => Package['syslog-ng']
 	}
-	if $::hostname in [lotty,lully,loghost-grnet-01,loghost-osuosl-01] {
-		file { '/etc/logrotate.d/syslog-ng-loggers':
-			source  => 'puppet:///modules/syslog_ng/syslog-ng.logrotate.loggers',
-			require => Package['syslog-ng']
-		}
-		file { '/etc/cron.daily/local-handle-loghost-logs':
-			ensure => absent,
-		}
-		file { '/etc/cron.daily/puppet-handle-loghost-logs':
-			source => 'puppet:///modules/syslog_ng/loggers-cron',
-			mode   => '0555',
-		}
-	}
-	# while syslog-ng breaks on boot
 
 	if $systemd {
 		file { '/etc/systemd/system/syslog-ng.service':