Change distribution selection for buildd stuff

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 5a7c21b8e6416d9b39a34b50d87e6bd81d794161..335da3f012bbbf9936923da858e6a844326ec9cf 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,27 +1,89 @@
 class buildd {
-   package {
-     "sbuild": ensure => installed;
-     "buildd": ensure => installed;
-     "buildd-builder-meta": ensure => installed;
-     "apt-transport-https": ensure => installed;
-     "debootstrap": ensure => installed;
-   }
-
-   file {
-      "/etc/apt/sources.list.d/buildd.list":
-             source  => template("buildd/etc/apt/sources.list.d/buildd.list"),
-             require => Package["apt-transport-https"],
-             notify  => Exec["apt-get update"],
-             ;
-
-      "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
-            source  => "puppet:///buildd/buildd.debian.org.asc",
-            mode    => 664,
-            notify  => Exec["apt-keys-update"],
-            ;
-      "/etc/schroot/mount-defaults":
-            source  => "puppet:///buildd/mount-defaults",
-            require => Package["sbuild"]
-            ;
-   }
+
+       package { [
+                       'schroot',
+                       'sbuild'
+               ]:
+               ensure  => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/buildd.debian.org.list'],
+                       Exec['apt-get update']
+               ]
+       }
+
+       package { 'apt-transport-https':
+               ensure => installed,
+       }
+       package { [
+                       'debootstrap',
+                       'dupload'
+               ]:
+               ensure => installed,
+       }
+
+       site::linux_module { 'dm_snapshot': }
+       ferm::module { 'nf_conntrack_ftp': }
+
+       site::aptrepo { 'buildd':
+               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':
+               content => template('buildd/etc/apt/preferences.d/buildd'),
+               before  => File['/etc/apt/sources.list.d/buildd.debian.org.list']
+       }
+       file { '/etc/schroot/mount-defaults':
+               content => template('buildd/etc/schroot/mount-defaults.erb'),
+               require => Package['sbuild'],
+       }
+       file { '/etc/cron.d/dsa-buildd':
+               source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
+               require => Package['debian.org']
+       }
+       file { '/etc/dupload.conf':
+               source  => 'puppet:///modules/buildd/dupload.conf',
+               require => Package['dupload'],
+       }
+       file { '/etc/default/schroot':
+               source  => 'puppet:///modules/buildd/default-schroot',
+               require => Package['schroot']
+       }
+
 }