X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=3cac13b3a5de1f77b120c017234c0b247381a6ae;hb=cdb706d164cd9d0c02d649c0157da63ef0aa7b4e;hp=838a4a288bdc6e22d268923049341feace8d79f3;hpb=a392dc86eac9dc877cd970f8886b9edfd43e9f59;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 838a4a288..3cac13b3a 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -6,12 +6,27 @@ class debian-org {
 	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
 		$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
 	} else {
-		$mirror = 'http://http.debian.net/debian/'
+		#$mirror = 'http://ftp.debian.org/debian/'
+		if $::lsbmajdistrelease <= 8 {
+			$mirror = 'http://cdn-fastly.deb.debian.org/debian/'
+		} else {
+			$mirror = 'http://deb.debian.org/debian/'
+		}
+	}
+
+	if $::lsbmajdistrelease <= 7 {
+		$mungedcodename = $::lsbdistcodename
+	} elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		$mungedcodename = "${::lsbdistcodename}-kfreebsd"
+	} else {
+		$mungedcodename = $::lsbdistcodename
 	}
-	if $::lsbmajdistrelease < 7 {
-		$mirror_backports = 'http://backports.debian.org/debian-backports/'
+
+	if $systemd {
+		include systemd
+		$servicefiles = 'present'
 	} else {
-		$mirror_backports = $mirror
+		$servicefiles = 'absent'
 	}
 
 	$debianadmin = [
@@ -19,14 +34,15 @@ class debian-org {
 		'debian-admin@ftbfs.de',
 		'weasel@debian.org',
 		'steve@lobefin.net',
-		'paravoid@debian.org',
-		'zumbi@kos.to'
+		'zumbi@oron.es'
 	]
 
 	package { [
 			'klogd',
 			'sysklogd',
 			'rsyslog',
+			'os-prober',
+			'apt-listchanges',
 		]:
 		ensure => purged,
 	}
@@ -37,14 +53,25 @@ 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 ($::lsbmajdistrelease >= 8) {
+		$rubyfs_package = 'ruby-filesystem'
+	} else {
+		$rubyfs_package = 'libfilesystem-ruby1.9'
+	}
 	package { [
 			'apt-utils',
 			'bash-completion',
 			'dnsutils',
 			'less',
 			'lsb-release',
-			'libfilesystem-ruby1.8',
+			$rubyfs_package,
 			'mtr-tiny',
 			'nload',
 			'pciutils',
@@ -52,12 +79,6 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease >= 7 {
-		package { 'libfilesystem-ruby1.9.1':
-			ensure => installed,
-		}
-	}
-
 	munin::check { [
 			'cpu',
 			'entropy',
@@ -109,21 +130,23 @@ class debian-org {
 		content => "",
 	}
 
-	site::aptrepo { 'security':
-		url        => 'http://security.debian.org/',
-		suite      => "${::lsbdistcodename}/updates",
-		components => ['main','contrib','non-free']
-	}
-	if $::lsbmajdistrelease < 7 {
-		site::aptrepo { 'debian-lts':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-lts",
+	if ($::lsbmajdistrelease >= 8) {
+		site::aptrepo { 'security':
+			url        => 'http://security-cdn.debian.org/',
+			suite      => "${mungedcodename}/updates",
 			components => ['main','contrib','non-free']
 		}
+	} else {
+		site::aptrepo { 'security':
+			ensure => absent,
+		}
+	}
+	site::aptrepo { 'debian-lts':
+		ensure => absent,
 	}
 
 	site::aptrepo { 'backports.debian.org':
-		url        => $mirror_backports,
+		url        => $mirror,
 		suite      => "${::lsbdistcodename}-backports",
 		components => ['main','contrib','non-free']
 	}
@@ -134,12 +157,16 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+	if ($::hostname in [] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
 		site::aptrepo { 'proposed-updates':
 			url        => $mirror,
-			suite      => "${::lsbdistcodename}-proposed-updates",
+			suite      => "${mungedcodename}-proposed-updates",
 			components => ['main','contrib','non-free']
 		}
+	} else {
+		site::aptrepo { 'proposed-updates':
+			ensure => absent,
+		}
 	}
 
 	site::aptrepo { 'debian.org':
@@ -148,10 +175,15 @@ class debian-org {
 
 	site::aptrepo { 'db.debian.org':
 		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'lenny',
+		suite      => 'debian-all',
 		components => 'main',
 		key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
 	}
+	site::aptrepo { 'db.debian.org-suite':
+		url        => 'http://db.debian.org/debian-admin',
+		suite      => $::lsbdistcodename,
+		components => 'main',
+	}
 
 	augeas { 'inittab_replicate':
 		context => '/files/etc/inittab',
@@ -166,10 +198,19 @@ 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']
 		}
 	}
+	site::aptrepo { 'debian-cdn':
+		ensure => absent,
+	}
+
+	site::aptrepo { 'debian2':
+		url        => "http://cdn-fastly.deb.debian.org/debian",
+		suite      => $mungedcodename,
+		components => ['main','contrib','non-free']
+	}
 
 	file { '/etc/facter':
 		ensure  => directory,
@@ -210,13 +251,39 @@ class debian-org {
 	file { '/etc/default/puppet':
 		source => 'puppet:///modules/debian-org/puppet.default',
 	}
+	file { '/etc/systemd':
+		ensure  => directory,
+		mode => 0755,
+	}
+	file { '/etc/systemd/system':
+		ensure  => directory,
+		mode => 0755,
+	}
+	file { '/etc/systemd/system/ud-replicated.service':
+		ensure => $servicefiles,
+		source => 'puppet:///modules/debian-org/ud-replicated.service',
+		notify => Exec['systemctl daemon-reload'],
+	}
+	if $systemd {
+		file { '/etc/systemd/system/multi-user.target.wants/ud-replicated.service':
+			ensure => 'link',
+			target => '../ud-replicated.service',
+			notify => Exec['systemctl daemon-reload'],
+		}
+	}
+	file { '/etc/systemd/system/puppet.service':
+		ensure => 'link',
+		target => '/dev/null',
+		notify => Exec['systemctl daemon-reload'],
+	}
+
 	file { '/etc/cron.d/dsa-puppet-stuff':
-		source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
+		content => template('debian-org/dsa-puppet-stuff.cron.erb'),
 		require => Package['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'],
@@ -228,8 +295,8 @@ class debian-org {
 	}
 	file { '/etc/rc.local':
 		mode   => '0755',
-		source => 'puppet:///modules/debian-org/rc.local',
-		notify => Exec['rc.local start'],
+		content => template('debian-org/rc.local.erb'),
+		notify => Exec['service rc.local start'],
 	}
 	file { '/etc/dsa':
 		ensure => directory,
@@ -283,18 +350,26 @@ class debian-org {
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true
 	}
-	exec { 'puppetmaster restart':
-		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+	exec { 'service puppetmaster restart':
 		refreshonly => true
 	}
-	exec { 'rc.local start':
-		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+	exec { 'service rc.local start':
 		refreshonly => true
 	}
 	exec { 'init q':
 		refreshonly => true
 	}
 
+	exec { 'systemctl daemon-reload':
+		refreshonly => true,
+		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,
@@ -302,4 +377,17 @@ class debian-org {
 		matches  => [ 'paths', 'contents' ],
 		schedule => weekly
 	}
+
+	file { '/root/.bashrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/bashrc',
+	}
+	file { '/root/.profile':
+		source => 'puppet:///modules/debian-org/root-dotfiles/profile',
+	}
+	file { '/root/.screenrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
+	}
+	file { '/root/.vimrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/vimrc',
+	}
 }