X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=5389a5fa9dfb48008a1cae4ef9d9c18624fe7c4e;hb=ab52321ca7ccd1b0c42c41cd62d4a06b976e119c;hp=205730ba64b3e71be6a78d7bec77abf136a7a5cf;hpb=95eb00d9ac5f57b6d688a8ab7d65fd1fceb380a1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 205730ba6..5389a5fa9 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -31,16 +31,9 @@ class buildd ($ensure=present) {
 				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'],
-				}
+			file { '/etc/sbuild/sbuild.conf':
+				source  => 'puppet:///modules/buildd/sbuild.conf',
+				require => Package['sbuild'],
 			}
 			include ferm::ftp_conntrack
 		}
@@ -57,12 +50,18 @@ class buildd ($ensure=present) {
 			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'],
+		if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+			site::aptrepo { 'buildd.debian.org':
+				ensure => absent,
+			}
+		} else {
+			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'],
+			}
 		}
 
 		file { '/etc/apt/apt.conf.d/puppet-https-buildd':
@@ -76,7 +75,9 @@ class buildd ($ensure=present) {
 		file { '/etc/apt/preferences.d/buildd':
 			ensure => absent,
 		}
-		file { '/etc/cron.d/dsa-buildd':
+		file { '/etc/cron.d/dsa-buildd': ensure => absent, }
+		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']
 		}
@@ -85,16 +86,9 @@ class buildd ($ensure=present) {
 			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',
-				}
+			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':
@@ -102,8 +96,12 @@ class buildd ($ensure=present) {
 				mode    => '0555',
 			}
 		}
-		file { '/etc/cron.d/puppet-buildd-aptitude':
-			content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+		file { '/etc/cron.d/puppet-buildd-aptitude': ensure => absent }
+		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
 		}
 
 		service { 'buildd':
@@ -111,9 +109,13 @@ class buildd ($ensure=present) {
 			ensure => 'stopped',
 		}
 
+		file { '/etc/cron.d/puppet-update-buildd-schroots': ensure => absent }
 		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",
+			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
 			}
 		}