X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=29a35246afe7f770bacfeeeff6a0f5697392c828;hb=6f170969f00763a6592413d200b598414cc283e9;hp=a54f548639d5ea8c6b23c59ecae0a5daeec04217;hpb=0ba93256399fbad7ed8fabfa39c24dd47169dde3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index a54f54863..29a35246a 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -101,7 +101,7 @@ class buildd ($ensure=present) {
 		#
 		# buildd/pybuildd configuration
 		#
-		if $::hostname in [x86-bm-01,x86-grnet-01,zani] {
+		if $::hostname in [x86-grnet-01,x86-grnet-02,zani] {
 			#
 			# pybuildd configuration
 			#
@@ -149,6 +149,13 @@ class buildd ($ensure=present) {
 				group   => buildd,
 				owner   => buildd,
 			}
+			# work around https://salsa.debian.org/wb-team/pybuildd/issues/11
+			concat::fragment { 'dsa-puppet-stuff--pybuildd-expire-logs':
+				target => '/etc/cron.d/dsa-puppet-stuff',
+				content  => @(EOF)
+					@daily buildd [ -d ~buildd/logs ] && find ~buildd/logs -type f -mtime +90 -delete
+					| EOF
+			}
 		} else {
 			#
 			# buildd configuration
@@ -209,29 +216,6 @@ class buildd ($ensure=present) {
 				require => Package['buildd'],
 			}
 
-			if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
-				site::aptrepo { 'buildd.debian.org':
-					ensure => absent,
-				}
-				file { '/etc/apt/apt.conf.d/puppet-https-buildd':
-					ensure => absent,
-				}
-			} else {
-				package { 'apt-transport-https':
-					ensure => installed,
-				}
-				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',