Revert "now make it go away"

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index a7c70110d2616346cb086f35d7569ee67d27b10f..3a9d5087aa50b6d306cc038340f6b9b7a1605789 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,23 +1,76 @@
 class buildd {
+
+       package { 'schroot':
+               ensure => installed,
+               tag    => extra_repo,
+       }
+       package { 'sbuild':
+               ensure => installed,
+               tag    => extra_repo,
+       }
+       package { 'libsbuild-perl':
+               ensure => installed,
+               tag    => extra_repo,
+               before => Package['sbuild']
+       }
+
+       package { 'apt-transport-https':
+               ensure => installed,
+       }
        package { [
-                       'schroot',
-                       'sbuild',
-                       'apt-transport-https',
                        'debootstrap',
                        'dupload'
                ]:
-                       ensure => installed
+               ensure => installed,
        }
 
        site::linux_module { 'dm_snapshot': }
+       ferm::module { 'nf_conntrack_ftp': }
 
        site::aptrepo { 'buildd':
-               content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
-               key     => 'puppet:///modules/buildd/buildd.debian.org.asc',
+               ensure => absent,
+       }
+
+       $suite = $::lsbdistcodename ? {
+               squeeze => $::lsbdistcodename,
+               wheezy  => $::lsbdistcodename,
+               undef   => 'squeeze',
+               default => 'wheezy'
        }
 
+       site::aptrepo { 'buildd.debian.org':
+               key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+               url        => 'https://buildd.debian.org/apt/',
+               suite      => $suite,
+               components => 'main',
+               require    => Package['apt-transport-https'],
+       }
+
+       if $::hostname in [alkman,porpora,zandonai] {
+               site::aptrepo { 'buildd.debian.org-proposed':
+                       url        => 'https://buildd.debian.org/apt/',
+                       suite      => "${suite}-proposed",
+                       components => 'main',
+                       require    => Package['apt-transport-https'],
+               }
+       }
+
+       if $::hostname in [krenek] {
+               site::aptrepo { 'buildd.debian.org-experimental':
+                       url        => 'https://buildd.debian.org/apt/',
+                       suite      => "${suite}-experimental",
+                       components => 'main',
+                       require    => Package['apt-transport-https'],
+               }
+       }
+
+       # 'bad' extension
+       file { '/etc/apt/preferences.d/buildd.debian.org':
+               ensure => absent,
+       }
        file { '/etc/apt/preferences.d/buildd':
-               ensure  => absent
+               content => template('buildd/etc/apt/preferences.d/buildd'),
+               before  => Site::Aptrepo['buildd.debian.org']
        }
        file { '/etc/schroot/mount-defaults':
                content => template('buildd/etc/schroot/mount-defaults.erb'),