X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=aa90ad0309482d270076fa9e9a014f5a82bcf583;hb=d36e70cc1c6db90f82342133df02d29a01b974c3;hp=db9e9d37b03da8a7f9bea6e2c3d7d07412579025;hpb=8bd3f71edda5a06bca3327527738f2d5abdd29f1;p=dsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index db9e9d37..aa90ad03 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -14,6 +14,14 @@ class debian-org {
 		$mirror_backports = $mirror
 	}
 
+	if $::lsbmajdistrelease <= 7 {
+		$mungedcodename = $::lsbdistcodename
+	} elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		$mungedcodename = "${::lsbdistcodename}-kfreebsd"
+	} else {
+		$mungedcodename = $::lsbdistcodename
+	}
+
 	if $systemd {
 		include systemd
 		$servicefiles = 'present'
@@ -53,13 +61,20 @@ class debian-org {
 		source  => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
 	}
 
+	if ($::lsbmajdistrelease >= 8) {
+		$rubyfs_package = 'ruby-filesystem'
+	} elsif $::lsbmajdistrelease == 7  {
+		$rubyfs_package = 'libfilesystem-ruby1.9'
+	} else {
+		$rubyfs_package = 'libfilesystem-ruby1.8'
+	}
 	package { [
 			'apt-utils',
 			'bash-completion',
 			'dnsutils',
 			'less',
 			'lsb-release',
-			'libfilesystem-ruby1.8',
+			$rubyfs_package,
 			'mtr-tiny',
 			'nload',
 			'pciutils',
@@ -67,16 +82,6 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease == 7 {
-		package { 'libfilesystem-ruby1.9.1':
-			ensure => installed,
-		}
-	} elsif $::lsbmajdistrelease >= 8 {
-		package { 'ruby-filesystem':
-			ensure => installed,
-		}
-	}
-
 	munin::check { [
 			'cpu',
 			'entropy',
@@ -130,7 +135,7 @@ class debian-org {
 
 	site::aptrepo { 'security':
 		url        => 'http://security.debian.org/',
-		suite      => "${::lsbdistcodename}/updates",
+		suite      => "${mungedcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
 	if $::lsbmajdistrelease < 7 {
@@ -157,7 +162,7 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
+	#if ($::hostname in [corelli, eysler, lucatelli, mayr, pettersson]) or
 	#   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
 	#	site::aptrepo { 'proposed-updates':
 	#		url        => $mirror,
@@ -199,7 +204,7 @@ class debian-org {
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
 		site::aptrepo { 'debian':
 			url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
-			suite      => $::lsbdistcodename,
+			suite      => $mungedcodename,
 			components => ['main','contrib','non-free']
 		}
 	}
@@ -275,7 +280,7 @@ class debian-org {
 	}
 	file { '/etc/ldap/ldap.conf':
 		require => Package['debian.org'],
-		source  => 'puppet:///modules/debian-org/ldap.conf',
+		content  => template('debian-org/ldap.conf.erb'),
 	}
 	file { '/etc/pam.d/common-session':
 		require => Package['debian.org'],
@@ -287,7 +292,7 @@ class debian-org {
 	}
 	file { '/etc/rc.local':
 		mode   => '0755',
-		source => 'puppet:///modules/debian-org/rc.local',
+		content => template('debian-org/rc.local.erb'),
 		notify => Exec['service rc.local start'],
 	}
 	file { '/etc/dsa':
@@ -357,6 +362,11 @@ class debian-org {
 		onlyif  => "test -x /bin/systemctl"
 	}
 
+	exec { 'systemd-tmpfiles --create --exclude-prefix=/dev':
+		refreshonly => true,
+		onlyif  => "test -x /bin/systemd-tmpfiles"
+	}
+
 	tidy { '/var/lib/puppet/clientbucket/':
 		age      => '2w',
 		recurse  => 9,