X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=fdb213570fbfecb0f8089552db941ff709119dfd;hb=6c85e519c941708efc164a51004d63c477a8b9b8;hp=6cb629efc073bec1b6ab32e64e83c023fefac997;hpb=249b713a08d35bffb1cd52739be6f5808baa5a5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 6cb629efc..fdb213570 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -26,6 +26,7 @@ class debian_org {
 			'rsyslog',
 			'os-prober',
 			'apt-listchanges',
+			'mlocate',
 		]:
 		ensure => purged,
 	}
@@ -43,7 +44,7 @@ class debian_org {
 		source  => 'puppet:///modules/debian_org/basic-ssh_known_hosts'
 	}
 
-	if ($::lsbmajdistrelease >= '8') {
+	if versioncmp($::lsbmajdistrelease, '8') >= 0 {
 		$rubyfs_package = 'ruby-filesystem'
 	} else {
 		$rubyfs_package = 'libfilesystem-ruby1.9'
@@ -136,7 +137,7 @@ class debian_org {
 	}
 	file { '/etc/puppet/puppet.conf':
 		content => template('debian_org/puppet.conf.erb'),
-		mode => 0440,
+		mode => '0440',
 		group => 'puppet',
 	}
 	file { '/etc/default/puppet':
@@ -144,11 +145,11 @@ class debian_org {
 	}
 	file { '/etc/systemd':
 		ensure  => directory,
-		mode => 0755,
+		mode => '0755',
 	}
 	file { '/etc/systemd/system':
 		ensure  => directory,
-		mode => 0755,
+		mode => '0755',
 	}
 	file { '/etc/systemd/system/ud-replicated.service':
 		ensure => $servicefiles,