X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=1469da65c9a5cee58e6fb827b28f8e0917ecad20;hb=7fcd3b79c6af679888217733c2f2b3772020f677;hp=6d2d0c62d946b222b0875c044139ca20a0b28c4d;hpb=e81d2dd357118ed7157fa2fa5107b57f28c3cdf0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 6d2d0c62d..1469da65c 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -16,8 +16,18 @@ class ferm {
 	package { 'ferm':
 		ensure => installed
 	}
-	package { 'ulogd':
-		ensure => installed
+	if ($::lsbmajdistrelease >= 8) {
+		package { 'ulogd2':
+			ensure => installed
+		}
+		package { 'ulogd':
+			# Remove instead of purge ulogd because it deletes log files on purge.
+			ensure => absent
+		}
+	} else {
+		package { 'ulogd':
+			ensure => installed
+		}
 	}
 
 	service { 'ferm':
@@ -82,10 +92,31 @@ class ferm {
 		content => template('ferm/interfaces.conf.erb'),
 		notify  => Service['ferm'],
 	}
-	file { '/etc/logrotate.d/ulogd':
-		source  => 'puppet:///modules/ferm/logrotate-ulogd',
-		mode    => '0444',
-		require => Package['debian.org'],
+	if ($::lsbmajdistrelease >= 8) {
+		augeas { 'logrotate_ulogd2':
+			context => '/files/etc/logrotate.d/ulogd2',
+			changes => [
+				'set rule/schedule daily',
+				'set rule/delaycompress delaycompress',
+				'set rule/rotate 10',
+				'set rule/ifempty notifempty',
+			],
+		}
+		file { '/etc/logrotate.d/ulogd':
+			ensure  => absent,
+		}
+		file { '/etc/logrotate.d/ulogd.dpkg-bak':
+			ensure  => absent,
+		}
+		file { '/etc/logrotate.d/ulogd.dpkg-dist':
+			ensure  => absent,
+		}
+	} else {
+		file { '/etc/logrotate.d/ulogd':
+			source  => 'puppet:///modules/ferm/logrotate-ulogd',
+			mode    => '0444',
+			require => Package['debian.org'],
+		}
 	}
 
 }