X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=33ab60456636965f8c88d5eff3c2392a40fafa9c;hb=5d6d2f43b495114f97fb2640124c38d66cc85b60;hp=4417bfd5785b953106aea900d4e0d5b202a26c22;hpb=c3ac7edbf4f5bab8820a046e6d5dbf89e11fda1f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 4417bfd57..33ab60456 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -27,6 +27,8 @@ class debian-org {
 			'klogd',
 			'sysklogd',
 			'rsyslog',
+			'os-prober',
+			'apt-listchanges',
 		]:
 		ensure => purged,
 	}
@@ -37,6 +39,12 @@ 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'
+	}
 
 	package { [
 			'apt-utils',
@@ -52,10 +60,14 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease >= 7 {
+	if $::lsbmajdistrelease == 7 {
 		package { 'libfilesystem-ruby1.9.1':
 			ensure => installed,
 		}
+	} elsif $::lsbmajdistrelease >= 8 {
+		package { 'ruby-filesystem':
+			ensure => installed,
+		}
 	}
 
 	munin::check { [
@@ -101,16 +113,30 @@ class debian-org {
 
 	file { '/etc/apt/trusted-keys.d':
 		ensure => absent,
+		force  => true,
 	}
-	file { '/etc/apt/trusted.gpg',
+
+	file { '/etc/apt/trusted.gpg':
 		mode    => '0600',
 		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",
+			components => ['main','contrib','non-free']
+		}
+	} else {
+		site::aptrepo { 'debian-lts':
+			ensure => absent,
+		}
+	}
 
 	site::aptrepo { 'backports.debian.org':
 		url        => $mirror_backports,
@@ -124,13 +150,18 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+	#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
+	#   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
+	#	site::aptrepo { 'proposed-updates':
+	#		url        => $mirror,
+	#		suite      => "${::lsbdistcodename}-proposed-updates",
+	#		components => ['main','contrib','non-free']
+	#	}
+	#} else {
 		site::aptrepo { 'proposed-updates':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-proposed-updates",
-			components => ['main','contrib','non-free']
+			ensure => absent,
 		}
-	}
+	#}
 
 	site::aptrepo { 'debian.org':
 		ensure => absent,
@@ -138,9 +169,14 @@ 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',
-		key        => 'puppet:///modules/debian-org/db.debian.org.asc',
 	}
 
 	augeas { 'inittab_replicate':
@@ -177,10 +213,6 @@ class debian-org {
 	file { '/etc/apt/preferences':
 		source => 'puppet:///modules/debian-org/apt.preferences',
 	}
-	file { '/etc/apt/trusted-keys.d/':
-		ensure => directory,
-		purge  => true,
-	}
 	file { '/etc/apt/apt.conf.d/local-compression':
 		source => 'puppet:///modules/debian-org/apt.conf.d/local-compression',
 	}
@@ -204,6 +236,16 @@ class debian-org {
 	file { '/etc/default/puppet':
 		source => 'puppet:///modules/debian-org/puppet.default',
 	}
+	file { '/etc/systemd/system':
+		ensure  => directory,
+		recurse => true,
+	}
+        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',
 		require => Package['debian.org'],
@@ -223,7 +265,7 @@ class debian-org {
 	file { '/etc/rc.local':
 		mode   => '0755',
 		source => 'puppet:///modules/debian-org/rc.local',
-		notify => Exec['rc.local start'],
+		notify => Exec['service rc.local start'],
 	}
 	file { '/etc/dsa':
 		ensure => directory,
@@ -277,18 +319,21 @@ 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"
+	}
+
 	tidy { '/var/lib/puppet/clientbucket/':
 		age      => '2w',
 		recurse  => 9,
@@ -296,4 +341,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',
+	}
 }