X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsyslog_ng%2Fmanifests%2Finit.pp;h=e7a20b6309110032e4611b6d74f359de57815da1;hb=be67e1b495a7676e7388f973894045e4f45cb54b;hp=a9b520673cfa205ba0ae2173f18068de14ee5847;hpb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog_ng/manifests/init.pp b/modules/syslog_ng/manifests/init.pp
index a9b520673..e7a20b630 100644
--- a/modules/syslog_ng/manifests/init.pp
+++ b/modules/syslog_ng/manifests/init.pp
@@ -23,17 +23,23 @@ class syslog_ng {
 		source  => 'puppet:///modules/syslog_ng/syslog-ng.logrotate',
 		require => Package['syslog-ng']
 	}
-	if $::hostname in [lotty,lully,loghost-grnet-01] {
+	if $::hostname in [lotti,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':
-			ensure => $servicefiles,
 			source => 'puppet:///modules/syslog_ng/syslog-ng.service',
 			notify => Exec['systemctl daemon-reload'],
 		}