X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=6ec2a0ffb3a6cc00cae8a123474d0a9723aff0eb;hb=66ccd5ef78f7208f3d02fd5e9a3d815aadf3ab2d;hp=8eec93eaf52c058afc450da594568f8a6d04cd3d;hpb=08f0d0dcaeccad3e7950f07581538aae180748fb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 8eec93eaf..6ec2a0ffb 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -3,24 +3,7 @@
 # Stuff common to all debian.org servers
 #
 class debian-org {
-	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-		$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
-	} else {
-		$mirror = 'http://ftp.debian.org/debian/'
-	}
-	if $::lsbmajdistrelease < 7 {
-		$mirror_backports = 'http://backports.debian.org/debian-backports/'
-	} else {
-		$mirror_backports = $mirror
-	}
-
-	if $::lsbmajdistrelease <= 7 {
-		$mungedcodename = $::lsbdistcodename
-	} elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-		$mungedcodename = "${::lsbdistcodename}-kfreebsd"
-	} else {
-		$mungedcodename = $::lsbdistcodename
-	}
+	include debian-org::apt
 
 	if $systemd {
 		include systemd
@@ -34,8 +17,7 @@ class debian-org {
 		'debian-admin@ftbfs.de',
 		'weasel@debian.org',
 		'steve@lobefin.net',
-		'paravoid@debian.org',
-		'zumbi@kos.to'
+		'zumbi@oron.es'
 	]
 
 	package { [
@@ -64,7 +46,7 @@ class debian-org {
 	if ($::lsbmajdistrelease >= 8) {
 		$rubyfs_package = 'ruby-filesystem'
 	} else {
-		$rubyfs_package = 'libfilesystem-ruby1.8'
+		$rubyfs_package = 'libfilesystem-ruby1.9'
 	}
 	package { [
 			'apt-utils',
@@ -80,16 +62,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',
@@ -131,74 +103,6 @@ class debian-org {
 		require => Package['molly-guard'],
 	}
 
-	file { '/etc/apt/trusted-keys.d':
-		ensure => absent,
-		force  => true,
-	}
-
-	file { '/etc/apt/trusted.gpg':
-		mode    => '0600',
-		content => "",
-	}
-
-	site::aptrepo { 'security':
-		url        => 'http://security.debian.org/',
-		suite      => "${mungedcodename}/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,
-		suite      => "${::lsbdistcodename}-backports",
-		components => ['main','contrib','non-free']
-	}
-
-	site::aptrepo { 'volatile':
-		url        => $mirror,
-		suite      => "${::lsbdistcodename}-updates",
-		components => ['main','contrib','non-free']
-	}
-
-	#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':
-			ensure => absent,
-		}
-	#}
-
-	site::aptrepo { 'debian.org':
-		ensure => absent,
-	}
-
-	site::aptrepo { 'db.debian.org':
-		url        => 'http://db.debian.org/debian-admin',
-		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',
 		changes => [
@@ -209,13 +113,6 @@ class debian-org {
 		notify  => Exec['init q'],
 	}
 
-	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-		site::aptrepo { 'debian':
-			url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
-			suite      => $mungedcodename,
-			components => ['main','contrib','non-free']
-		}
-	}
 
 	file { '/etc/facter':
 		ensure  => directory,
@@ -230,18 +127,6 @@ class debian-org {
 	file { '/etc/facter/facts.d/debian_facts.yaml':
 		content => template('debian-org/debian_facts.yaml.erb')
 	}
-	file { '/etc/apt/preferences':
-		source => 'puppet:///modules/debian-org/apt.preferences',
-	}
-	file { '/etc/apt/apt.conf.d/local-compression':
-		source => 'puppet:///modules/debian-org/apt.conf.d/local-compression',
-	}
-	file { '/etc/apt/apt.conf.d/local-recommends':
-		source => 'puppet:///modules/debian-org/apt.conf.d/local-recommends',
-	}
-	file { '/etc/apt/apt.conf.d/local-pdiffs':
-		source => 'puppet:///modules/debian-org/apt.conf.d/local-pdiffs',
-	}
 	file { '/etc/timezone':
 		source => 'puppet:///modules/debian-org/timezone',
 		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
@@ -252,6 +137,7 @@ class debian-org {
 	}
 	file { '/etc/puppet/puppet.conf':
 		content => template('debian-org/puppet.conf.erb'),
+		mode => 0440,
 	}
 	file { '/etc/default/puppet':
 		source => 'puppet:///modules/debian-org/puppet.default',
@@ -281,6 +167,11 @@ class debian-org {
 		target => '/dev/null',
 		notify => Exec['systemctl daemon-reload'],
 	}
+	file { '/etc/systemd/system/proc-sys-fs-binfmt_misc.automount':
+		ensure => 'link',
+		target => '/dev/null',
+		notify => Exec['systemctl daemon-reload'],
+	}
 
 	file { '/etc/cron.d/dsa-puppet-stuff':
 		content => template('debian-org/dsa-puppet-stuff.cron.erb'),
@@ -316,6 +207,18 @@ class debian-org {
 		source => 'puppet:///modules/debian-org/nsswitch.conf',
 	}
 
+	file { '/etc/profile.d/timeout.sh':
+		mode   => '0555',
+		source => 'puppet:///modules/debian-org/etc.profile.d/timeout.sh',
+	}
+	file { '/etc/zsh':
+		ensure => directory,
+	}
+	file { '/etc/zsh/zprofile':
+		mode   => '0444',
+		source => 'puppet:///modules/debian-org/etc.zsh/zprofile',
+	}
+
 	# set mmap_min_addr to 4096 to mitigate
 	# Linux NULL-pointer dereference exploits
 	site::sysctl { 'mmap_min_addr':
@@ -344,13 +247,6 @@ class debian-org {
 		group  => root,
 	}
 
-	exec { 'apt-get update':
-		path    => '/usr/bin:/usr/sbin:/bin:/sbin',
-		onlyif  => '/usr/local/bin/check_for_updates',
-		require => File['/usr/local/bin/check_for_updates']
-	}
-	Exec['apt-get update']->Package<| tag == extra_repo |>
-
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true
@@ -370,6 +266,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,
@@ -384,9 +285,15 @@ class debian-org {
 	file { '/root/.profile':
 		source => 'puppet:///modules/debian-org/root-dotfiles/profile',
 	}
+	file { '/root/.selected_editor':
+		source => 'puppet:///modules/debian-org/root-dotfiles/selected_editor',
+	}
 	file { '/root/.screenrc':
 		source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
 	}
+	file { '/root/.tmux.conf':
+		source => 'puppet:///modules/debian-org/root-dotfiles/tmux.conf',
+	}
 	file { '/root/.vimrc':
 		source => 'puppet:///modules/debian-org/root-dotfiles/vimrc',
 	}