X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Fmanifests%2Finit.pp;h=c55b6876bee196182499c1db3746036c90ba4e8a;hb=68ac1934cb606b4265e07a3907857078d95b9532;hp=36704e2083eb02bce55d4aa70cffe9b1f05fe429;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog-ng/manifests/init.pp b/modules/syslog-ng/manifests/init.pp
index 36704e208..c55b6876b 100644
--- a/modules/syslog-ng/manifests/init.pp
+++ b/modules/syslog-ng/manifests/init.pp
@@ -4,7 +4,9 @@ class syslog-ng {
 	}
 
 	service { 'syslog-ng':
-		ensure => running
+		ensure => running,
+		hasstatus => false,
+		pattern   => 'syslog-ng',
 	}
 
 	file { '/etc/syslog-ng/syslog-ng.conf':
@@ -21,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'],
+		}
+	}
 }