X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=23dfc2a79c31e683457b9085da415f7fadf93fd4;hb=80db38c8466ae26cd8f5bac97abccd2f5ce94a9e;hp=7115b7c8f9eedf1b1f624cbf635bb3f13f43eb19;hpb=dd99646641ae4254be0ebde30b22b7a3e48e189e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 7115b7c8f..23dfc2a79 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -16,7 +16,7 @@ class ferm {
 	package { 'ferm':
 		ensure => installed
 	}
-	if ($::lsbmajdistrelease >= 8) {
+	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
 		package { 'ulogd2':
 			ensure => installed
 		}
@@ -77,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':
@@ -92,7 +92,7 @@ class ferm {
 		content => template('ferm/interfaces.conf.erb'),
 		notify  => Service['ferm'],
 	}
-	if ($::lsbmajdistrelease >= 8) {
+	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
 		augeas { 'logrotate_ulogd2':
 			context => '/files/etc/logrotate.d/ulogd2',
 			changes => [
@@ -105,6 +105,12 @@ class ferm {
 		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',