disable elasticsearch - the service fails to start

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 0c109e0..5c6a301 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -32,22 +32,29 @@ class buildd ($ensure=present) {
        }
 
        $suite = $::lsbdistcodename ? {
-               squeeze => $::lsbdistcodename,
-               wheezy  => $::lsbdistcodename,
+               squeeze  => $::lsbdistcodename,
+               wheezy   => $::lsbdistcodename,
+               jessie   => $::lsbdistcodename,
+               stretch  => $::lsbdistcodename,
                undef   => 'squeeze',
                default => 'wheezy'
        }
 
+       $buildd_apt_url = $::debarchitecture ? {
+               /^sparc$/ => 'http://buildd.debian.org/apt/',
+               default   => 'https://buildd.debian.org/apt/',
+       }
+
        site::aptrepo { 'buildd.debian.org':
                key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-               url        => 'https://buildd.debian.org/apt/',
+               url        => $buildd_apt_url,
                suite      => $suite,
                components => 'main',
                require    => Package['apt-transport-https'],
        }
 
        $buildd_prop_ensure = $::hostname ? {
-               /^(alkman|brahms|porpora|zandonai)$/ => 'present',
+               /^(alkman|zandonai)$/ => 'present',
                default => 'absent',
        }
 
@@ -173,4 +180,11 @@ class buildd ($ensure=present) {
                }
        }
 
+
+       if $::buildd_user_exists {
+               exec { 'add-buildd-user-to-sbuild':
+                       command => 'adduser buildd sbuild',
+                       onlyif  => "getent group sbuild > /dev/null && ! getent group sbuild | grep '\\<buildd\\>' > /dev/null"
+               }
+       }
 }