X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=0338a1f99274ed0a769b397c81720ed1dbb51978;hb=54eade454bc9db2312ac374a94c79f6722333ce0;hp=b5238c3d3d1c845158de65bac4a09dd84b41e671;hpb=a5c5dfdd9e59822c957607e93e9330774704601d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index b5238c3d3..0338a1f99 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,6 +1,20 @@
 class buildd ($ensure=present) {
 	# Do nothing until we get the buildd user from ldap
 	if $::buildd_user_exists {
+		#
+		# home directory
+		#
+		file { '/home/buildd':
+			ensure  => directory,
+			mode    => '2755',
+			group   => buildd,
+			owner   => buildd,
+		}
+
+
+		#
+		# sbuild configuration, including chroots
+		#
 		include schroot
 
 		package { 'sbuild':
@@ -12,117 +26,82 @@ class buildd ($ensure=present) {
 			tag    => extra_repo,
 			before => Package['sbuild']
 		}
-
-		package { 'apt-transport-https':
-			ensure => installed,
+		file { '/etc/sbuild/sbuild.conf':
+			source  => 'puppet:///modules/buildd/sbuild.conf',
+			require => Package['sbuild'],
 		}
-		if $ensure == present {
-			package { 'dupload':
-				ensure => installed,
-			}
-			file { '/etc/dupload.conf':
-				source  => 'puppet:///modules/buildd/dupload.conf',
-				require => Package['dupload'],
-			}
-			package { 'buildd':
-				ensure => installed,
-			}
-			file { '/etc/buildd/buildd.conf':
-				source  => 'puppet:///modules/buildd/buildd.conf',
-				require => Package['buildd'],
-			}
-			if ($::lsbmajdistrelease >= '8') {
-				file { '/etc/sbuild/sbuild.conf':
-					source  => 'puppet:///modules/buildd/sbuild.conf',
-					require => Package['sbuild'],
-				}
-			} else {
-				file { '/etc/sbuild/sbuild.conf':
-					source  => 'puppet:///modules/buildd/sbuild.conf.wheezy',
-					require => Package['sbuild'],
-				}
+		if $has_srv_buildd {
+			concat::fragment { 'dsa-puppet-stuff--buildd-update-schroots':
+				target => '/etc/cron.d/dsa-puppet-stuff',
+				content  => @(EOF)
+					13 22 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd
+					| EOF
 			}
-			include ferm::ftp_conntrack
 		}
-
-		site::aptrepo { 'buildd':
-			ensure => absent,
+		exec { 'add-buildd-user-to-sbuild':
+			command => 'adduser buildd sbuild',
+			onlyif  => "getent group sbuild > /dev/null && ! getent group sbuild | grep '\\<buildd\\>' > /dev/null"
 		}
 
-		$suite = $::lsbdistcodename ? {
-			wheezy   => $::lsbdistcodename,
-			jessie   => $::lsbdistcodename,
-			stretch  => $::lsbdistcodename,
-			undef   => 'wheezy',
-			default => 'jessie'
-		}
 
-		site::aptrepo { 'buildd.debian.org':
-			key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-			url        => 'https://apt.buildd.debian.org/',
-			suite      => $suite,
-			components => 'main',
-			require    => Package['apt-transport-https'],
+		#
+		# dupload configuration
+		#
+		package { 'dupload':
+			ensure => installed,
 		}
-
-		file { '/etc/apt/apt.conf.d/puppet-https-buildd':
-			content => "Acquire::https::apt.buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
+		file { '/etc/dupload.conf':
+			source  => 'puppet:///modules/buildd/dupload.conf',
+			require => Package['dupload'],
 		}
+		include ferm::ftp_conntrack
 
-		# 'bad' extension
-		file { '/etc/apt/preferences.d/buildd.debian.org':
-			ensure => absent,
-		}
-		file { '/etc/apt/preferences.d/buildd':
-			ensure => absent,
-		}
-		file { '/etc/cron.d/dsa-buildd':
-			source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
-			require => Package['debian.org']
-		}
 
-		if ($::kernel == 'Linux') {
-			package { 'python-psutil':
-				ensure => installed,
-			}
-			if ($::lsbmajdistrelease >= '8') {
-				file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-					source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
-					mode    => '0555',
-				}
-			} else {
-				file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-					source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.wheezy',
-					mode    => '0555',
-				}
-			}
-		} else {
-			file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-				source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
-				mode    => '0555',
-			}
+		#
+		# Aptitude killer
+		#
+		package { 'python-psutil':
+			ensure => installed,
 		}
-		file { '/etc/cron.d/puppet-buildd-aptitude':
-			content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+		file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+			source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
+			mode    => '0555',
 		}
 
-		service { 'buildd':
-			enable => false,
-			ensure => 'stopped',
+		concat::fragment { 'dsa-puppet-stuff--buildd-aptitude-killer':
+			target => '/etc/cron.d/dsa-puppet-stuff',
+			content  => @(EOF)
+				*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill
+				| EOF
 		}
 
-		if $has_srv_buildd {
-			file { '/etc/cron.d/puppet-update-buildd-schroots':
-				content  => "13 21 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
-			}
-		}
 
-		file { '/home/buildd':
+		#
+		# GPG/SSH key generation
+		#
+		file { '/home/buildd/.gnupg':
 			ensure  => directory,
-			mode    => '2755',
+			mode    => '700',
 			group   => buildd,
 			owner   => buildd,
 		}
+		file { '/home/buildd/.gnupg/gpg.conf':
+			content  => "personal-digest-preferences SHA512\n",
+			group   => buildd,
+			owner   => buildd,
+		}
+
+		if ! $::buildd_key {
+			exec { 'create-buildd-key':
+				command => '/bin/su - buildd -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'',
+				onlyif  => '/usr/bin/getent passwd buildd > /dev/null && ! [ -e /home/buildd/.ssh/id_rsa ]'
+			}
+		}
+
+
+		#
+		# buildd configuration
+		#
 		file { '/home/buildd/build':
 			ensure  => directory,
 			mode    => '2750',
@@ -170,29 +149,71 @@ class buildd ($ensure=present) {
 			group   => buildd,
 			owner   => buildd,
 		}
-		file { '/home/buildd/.gnupg':
-			ensure  => directory,
-			mode    => '700',
-			group   => buildd,
-			owner   => buildd,
+
+		package { 'buildd':
+			ensure => installed,
 		}
-		file { '/home/buildd/.gnupg/gpg.conf':
-			content  => "personal-digest-preferences SHA512\n",
-			group   => buildd,
-			owner   => buildd,
+		file { '/etc/buildd/buildd.conf':
+			source  => 'puppet:///modules/buildd/buildd.conf',
+			require => Package['buildd'],
 		}
 
-		if ! $::buildd_key {
-			exec { 'create-buildd-key':
-				command => '/bin/su - buildd -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'',
-				onlyif  => '/usr/bin/getent passwd buildd > /dev/null && ! [ -e /home/buildd/.ssh/id_rsa ]'
+		if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+			site::aptrepo { 'buildd.debian.org':
+				ensure => absent,
+			}
+			file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+				ensure => absent,
+			}
+		} else {
+			site::aptrepo { 'buildd.debian.org':
+				key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
+				url        => 'https://apt.buildd.debian.org/',
+				suite      => 'jessie',
+				components => 'main',
+				require    => Package['apt-transport-https'],
+			}
+			file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+				content => "Acquire::https::apt.buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
 			}
 		}
 
+		concat::fragment { 'dsa-puppet-stuff--buildd':
+			target => '/etc/cron.d/dsa-puppet-stuff',
+			source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
+			require => Package['debian.org']
+		}
+		service { 'buildd':
+			enable => false,
+			ensure => 'stopped',
+		}
 
-		exec { 'add-buildd-user-to-sbuild':
-			command => 'adduser buildd sbuild',
-			onlyif  => "getent group sbuild > /dev/null && ! getent group sbuild | grep '\\<buildd\\>' > /dev/null"
+
+		#
+		# pybuildd configuration
+		#
+		file { '/home/buildd/.profile':
+			content  => @(EOT),
+				export XDG_RUNTIME_DIR="/run/user/$(id -u)"
+				export DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus"
+				| EOT
+			group   => buildd,
+			owner   => buildd,
+		}
+
+		file { '/var/lib/systemd/linger':
+			ensure  => directory,
+			mode    => '755',
+		}
+		file { "/var/lib/systemd/linger/buildd":
+			ensure => present,
+		}
+		file { '/etc/systemd/journald.conf.d':
+			ensure  => directory,
+			mode    => '755',
+		}
+		file { '/etc/systemd/journald.conf.d/persistency.conf':
+			source => 'puppet:///modules/systemd/persistency.conf',
 		}
 	}
 }