Provide a default configuration file for buildds

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index e168abc33354cf6d6e07e768d6458361ca5857fc..ee60baa7fb7cfc2531b062fc8161565d535db5fa 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -23,6 +23,13 @@ class buildd ($ensure=present) {
                        source  => 'puppet:///modules/buildd/dupload.conf',
                        require => Package['dupload'],
                }
+               package { 'buildd':
+                       ensure => installed,
+               }
+               file { '/etc/buildd/buildd.conf':
+                       source  => 'puppet:///modules/buildd/buildd.conf',
+                       require => Package['buildd'],
+               }
                site::linux_module { 'dm_snapshot': }
                include ferm::ftp_conntrack
        }
@@ -40,15 +47,14 @@ class buildd ($ensure=present) {
                default => 'wheezy'
        }
 
-       $buildd_apt_main_ensure = $::hostname ? {
-               /^(schroeder|sompek|stadler)$/ => 'absent',
-               default => 'present',
+       $buildd_apt_url = $::debarchitecture ? {
+               /^sparc$/ => 'http://buildd.debian.org/apt/',
+               default   => 'https://buildd.debian.org/apt/',
        }
 
        site::aptrepo { 'buildd.debian.org':
-               ensure     => $buildd_apt_main_ensure,
                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'],