X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;fp=modules%2Fferm%2Fmanifests%2Finit.pp;h=9290d35c0452d771e7d6041ed08caf9c11e795a9;hb=76ca91bce24ecbcbcc4e62a37aa06fd0fb9f96c7;hp=23dfc2a79c31e683457b9085da415f7fadf93fd4;hpb=46cee04ab06b23ab6e9e4baba655cf470d10cfc4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 23dfc2a79..9290d35c0 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -16,18 +16,12 @@ class ferm {
 	package { 'ferm':
 		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
-		}
+	package { 'ulogd2':
+		ensure => installed
+	}
+	package { 'ulogd':
+		# Remove instead of purge ulogd because it deletes log files on purge.
+		ensure => absent
 	}
 
 	service { 'ferm':
@@ -80,6 +74,10 @@ class ferm {
 		content => template('ferm/ferm.conf.erb'),
 		notify  => Service['ferm'],
 	}
+	file { '/etc/ferm/conf.d/00-init.conf':
+		content => template('ferm/00-init.conf.erb'),
+		notify  => Service['ferm'],
+	}
 	file { '/etc/ferm/conf.d/me.conf':
 		content => template('ferm/me.conf.erb'),
 		notify  => Service['ferm'],
@@ -92,31 +90,23 @@ class ferm {
 		content => template('ferm/interfaces.conf.erb'),
 		notify  => Service['ferm'],
 	}
-	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'],
-		}
+	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,
 	}
 
 }