X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=fd78eaf911dad8a6f24cfaff80a7b603a683006e;hb=63676c0e4a4ff14e69130cbc39880aaea679b845;hp=1472f308d81708d3aa3f95756f76040cb5203d01;hpb=4999970bbdafaa82d0baa4dc6b8c0901c82214d0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 1472f308d..fd78eaf91 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -6,7 +6,7 @@ class debian_org {
 	include debian_org::apt
 
 	if $systemd {
-		include systemd
+		include dsa_systemd
 		$servicefiles = 'present'
 	} else {
 		$servicefiles = 'absent'
@@ -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',
@@ -132,9 +121,16 @@ class debian_org {
 		content => template('debian_org/debian_facts.yaml.erb')
 	}
 	file { '/etc/timezone':
-		source => 'puppet:///modules/debian_org/timezone',
+		content => "Etc/UTC\n",
 		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
 	}
+	if versioncmp($::lsbmajdistrelease, '9') >= 0 { # jessie has a regular file there, for instance
+		file { '/etc/localtime':
+			ensure => 'link',
+			target => '/usr/share/zoneinfo/Etc/UTC',
+			notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
+		}
+	}
 	if $::hostname == handel {
 		include puppetmaster::db
 		$dbpassword = $puppetmaster::db::password
@@ -221,7 +217,7 @@ class debian_org {
 		require => Package['debian.org']
 	}
 	file { '/etc/nsswitch.conf':
-		mode   => '0755',
+		mode   => '0444',
 		source => 'puppet:///modules/debian_org/nsswitch.conf',
 	}
 
@@ -351,10 +347,27 @@ class debian_org {
 	}
 
 	# Disable kpartx udev rules
-	if $has_lib_udev_rules_d_60_kpartx_rules {
-		file { '/etc/udev/rules.d/60-kpartx.rules':
-			content => "",
-			mode => '0444',
+	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']
+	}
 }