clean up aptrepo ordering

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 0835e571738bee3c76e3a09ade9fd2c3925ebf08..efde37bde3198b416226c095ce8c592841305465 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -6,7 +6,6 @@ class buildd {
                ]:
                ensure  => installed,
                require => [
-                       File['etc/apt/sources.list.d/buildd.debian.org.list'],
                        Exec['apt-get update']
                ]
        }
@@ -19,10 +18,6 @@ class buildd {
                        'dupload'
                ]:
                ensure => installed,
-               require => [
-                       File['/etc/apt/sources.list.d/db.debian.org.list'],
-                       Exec['apt-get update']
-               ]
        }
 
        site::linux_module { 'dm_snapshot': }
@@ -31,23 +26,47 @@ class buildd {
        site::aptrepo { 'buildd':
                ensure => absent,
        }
+
+       $suite = $::lsbdistcodename ? {
+               squeeze => $::lsbdistcodename,
+               wheezy  => $::lsbdistcodename,
+               undef   => 'squeeze',
+               default => 'wheezy'
+       }
+
        site::aptrepo { 'buildd.debian.org':
-               template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
-               key      => 'puppet:///modules/buildd/buildd.debian.org.asc',
-               require  => Package['apt-transport-https'],
+               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':
-               ensure => directory,
-               mode   => '0755'
-       }
        file { '/etc/apt/preferences.d/buildd':
                content => template('buildd/etc/apt/preferences.d/buildd'),
-               before  => File['etc/apt/sources.list.d/buildd.debian.org.list']
+               before  => Site::Aptrepo['buildd.debian.org']
        }
        file { '/etc/schroot/mount-defaults':
                content => template('buildd/etc/schroot/mount-defaults.erb'),