X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;fp=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=151dd571ffee2e032713174a3fcd1f572309acc4;hb=76ca91bce24ecbcbcc4e62a37aa06fd0fb9f96c7;hp=27a3c87fd2adfcc37f05c521e8dbf9bfe0d06e11;hpb=46cee04ab06b23ab6e9e4baba655cf470d10cfc4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 27a3c87fd..151dd571f 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -41,25 +41,14 @@ class debian_org {
 		ensure => installed,
 		tag    => extra_repo,
 	}
-	file { '/etc/ssh/ssh_known_hosts':
-		ensure  => present,
-		replace => false,
-		mode    => '0644',
-		source  => 'puppet:///modules/debian_org/basic-ssh_known_hosts'
-	}
 
-	if versioncmp($::lsbmajdistrelease, '8') >= 0 {
-		$rubyfs_package = 'ruby-filesystem'
-	} else {
-		$rubyfs_package = 'libfilesystem-ruby1.9'
-	}
 	package { [
 			'apt-utils',
 			'bash-completion',
 			'dnsutils',
 			'less',
 			'lsb-release',
-			$rubyfs_package,
+			'ruby-filesystem',
 			'mtr-tiny',
 			'nload',
 			'pciutils',
@@ -349,4 +338,29 @@ class debian_org {
 		key   => 'kernel.unprivileged_bpf_disabled',
 		value => '1',
 	}
+
+	# Disable kpartx udev rules
+	file { '/etc/udev/rules.d/60-kpartx.rules':
+		ensure => $has_lib_udev_rules_d_60_kpartx_rules ? { true  => 'present', default => 'absent' },
+		content => "",
+		mode => '0444',
+	}
+
+	# this is only to avoid warnings, else puppet will complain that we
+	# have a symlink there, even if we're not replacing it anyhow.
+	if ! $has_etc_ssh_ssh_known_hosts {
+		file { '/etc/ssh/ssh_known_hosts':
+			ensure  => 'present',
+			replace => 'no',
+			content => inline_template('<%= open("/etc/ssh/ssh_known_hosts").read() %>'),
+			notify  => Exec['ud-replicate'],
+		}
+	}
+
+	exec { 'ud-replicate':
+		path => '/usr/bin:/usr/sbin:/bin:/sbin',
+		command => '/usr/bin/ud-replicate',
+		refreshonly => true,
+		require => Package['userdir-ldap']
+	}
 }