X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Fmanifests%2Finit.pp;h=c55b6876bee196182499c1db3746036c90ba4e8a;hb=cc20dbfce52b58e34cbb8b31b9c2f338b004b557;hp=7706c784ce1a023d1042dacb9e761b70cace0bed;hpb=f3353a606b20f1fcd78a811381305e9e11d1fe3c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog-ng/manifests/init.pp b/modules/syslog-ng/manifests/init.pp
index 7706c784c..c55b6876b 100644
--- a/modules/syslog-ng/manifests/init.pp
+++ b/modules/syslog-ng/manifests/init.pp
@@ -1,26 +1,46 @@
 class syslog-ng {
-    file {
-        "/etc/syslog-ng/syslog-ng.conf":
-            content => template("syslog-ng/syslog-ng.conf.erb"),
-            require => Package["syslog-ng"],
-            notify  => Exec["syslog-ng reload"],
-            ;
-        "/etc/default/syslog-ng":
-            require => Package["syslog-ng"],
-            source => "puppet:///modules/syslog-ng/syslog-ng.default",
-            notify  => Exec["syslog-ng reload"],
-            ;
-        "/etc/logrotate.d/syslog-ng":
-            require => Package["syslog-ng"],
-            source => "puppet:///modules/syslog-ng/syslog-ng.logrotate",
-            ;
-    }
-    exec {
-        "syslog-ng reload":
-            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-            refreshonly => true;
-    }
+	package { 'syslog-ng':
+		ensure => installed
+	}
+
+	service { 'syslog-ng':
+		ensure => running,
+		hasstatus => false,
+		pattern   => 'syslog-ng',
+	}
+
+	file { '/etc/syslog-ng/syslog-ng.conf':
+		content => template('syslog-ng/syslog-ng.conf.erb'),
+		require => Package['syslog-ng'],
+		notify  => Service['syslog-ng']
+	}
+	file { '/etc/default/syslog-ng':
+		source  => 'puppet:///modules/syslog-ng/syslog-ng.default',
+		require => Package['syslog-ng'],
+		notify  => Service['syslog-ng']
+	}
+	file { '/etc/logrotate.d/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'],
+		}
+	}
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: