X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=cf7f2a0f2edeb381db512d1ea33f8860e4b741e2;hb=e004cf0926cc3bdb95c0d71c79cd734b1e1cc806;hp=212829354f2e8ae86fcc202c9c1213a996b15062;hpb=0d7435ff446cc852321484e17c9913f874b54005;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 212829354..cf7f2a0f2 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -138,7 +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 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,
+			}
+			# 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 {
 			#
@@ -208,6 +224,9 @@ class buildd ($ensure=present) {
 					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/',