X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=23dfc2a79c31e683457b9085da415f7fadf93fd4;hb=a7d6a1e81e9e43b0b87698e9309ab3ec66c5bccc;hp=1469da65c9a5cee58e6fb827b28f8e0917ecad20;hpb=920b71fce1275a7dda1d63eb85dfcf3c11c89b8d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 1469da65c..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 => [