retire old DNS root key

[mirror/dsa-puppet.git] / modules / buildd / manifests / init.pp

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 33867d0..9bbbeea 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -105,23 +105,8 @@ class buildd ($ensure=present) {
                        #
                        # pybuildd configuration
                        #
-
-                       # We still rely on buildd for some features. Install the package
-                       # but keep it disabled.
                        package { 'buildd':
-                               ensure => installed,
-                       }
-                       service { 'buildd':
-                               enable => false,
-                               ensure => 'stopped',
-                       }
-                       file { '/home/buildd/NO-DAEMON-PLEASE':
-                               ensure => present,
-                       }
-                       file { '/home/buildd/.forward':
-                               content  => "|/usr/bin/buildd-mail\n",
-                               group   => buildd,
-                               owner   => buildd,
+                               ensure => purged,
                        }
 
                        package { ['python3-retrying', 'python3-yaml']:
@@ -155,6 +140,15 @@ class buildd ($ensure=present) {
                        file { '/etc/systemd/journald.conf.d/persistency.conf':
                                source => 'puppet:///modules/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,
+                       }
                } else {
                        #
                        # buildd configuration
@@ -223,6 +217,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/',