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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index e82602bba..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
 			#
@@ -138,23 +138,23 @@ class buildd ($ensure=present) {
 				mode    => '755',
 			}
 			file { '/etc/systemd/journald.conf.d/persistency.conf':
-				source => 'puppet:///modules/systemd/persistency.conf',
+				source => 'puppet:///modules/dsa_systemd/persistency.conf',
 			}
 
-			# Make sure that the build and logs directories have the correct
-			# permissions. This should go away once pybuildd issue #3 is
-			# solved.
+			# Make sure that the build directory have the correct permissions.
+			# This should go away once pybuildd issue #3 is solved.
 			file { '/home/buildd/build':
 				ensure  => directory,
 				mode    => '2750',
 				group   => buildd,
 				owner   => buildd,
 			}
-			file { '/home/buildd/logs':
-				ensure  => directory,
-				mode    => '2750',
-				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 {
 			#
@@ -216,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',