X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=15769e9e661c1b6b5987cacd260ea00a9df427f1;hb=080031d38a0e19b2a0641b5fd56c45d4b55a7a5d;hp=838a4a288bdc6e22d268923049341feace8d79f3;hpb=a392dc86eac9dc877cd970f8886b9edfd43e9f59;p=dsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 838a4a28..15769e9e 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 { [
@@ -120,6 +132,10 @@ class debian-org {
 			suite      => "${::lsbdistcodename}-lts",
 			components => ['main','contrib','non-free']
 		}
+	} else {
+		site::aptrepo { 'debian-lts':
+			ensure => absent,
+		}
 	}
 
 	site::aptrepo { 'backports.debian.org':
@@ -134,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,
@@ -148,10 +169,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',
@@ -210,6 +236,13 @@ class debian-org {
 	file { '/etc/default/puppet':
 		source => 'puppet:///modules/debian-org/puppet.default',
 	}
+        file { '/etc/systemd/system/puppet.service':
+		ensure => 'link',
+		target => '/dev/null',
+		notify => Exec['systemctl daemon-reload'],
+		onlyif => "test -d /etc/systemd/system",
+	}
+
 	file { '/etc/cron.d/dsa-puppet-stuff':
 		source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
 		require => Package['debian.org'],
@@ -229,7 +262,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,
@@ -283,18 +316,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,
@@ -302,4 +338,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',
+	}
 }