X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=23dfc2a79c31e683457b9085da415f7fadf93fd4;hb=b529b139a60ea8355089511737c8264185d8d074;hp=904d83a9a21bc261c8b99345866fc66f87c1dedd;hpb=38339aa5456ff34cbc8bb5ba8b7690799d341d48;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 904d83a9a..23dfc2a79 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -9,14 +9,25 @@
 class ferm {
 	# realize (i.e. enable) all @ferm::rule virtual resources
 	Ferm::Rule <| |>
+	Ferm::Conf <| |>
 
 	File { mode => '0400' }
 
 	package { 'ferm':
 		ensure => installed
 	}
-	package { 'ulogd':
-		ensure => installed
+	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
+		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':
@@ -66,7 +77,7 @@ class ferm {
 		mode    => '0444',
 	}
 	file { '/etc/ferm/ferm.conf':
-		source  => 'puppet:///modules/ferm/ferm.conf',
+		content => template('ferm/ferm.conf.erb'),
 		notify  => Service['ferm'],
 	}
 	file { '/etc/ferm/conf.d/me.conf':
@@ -81,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 (versioncmp($::lsbmajdistrelease, '8') >= 0) {
+		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'],
+		}
 	}
 
 }