Kill broken aptitudes on wheezy buildds

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 41efffe5840980999447e0c798659cd7b9eb8a54..6b6e7162d6900704b327fd585fd5152364dc9538 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,54 +1,92 @@
-class buildd {
-    package {
-        "schroot": ensure => installed;
-        "sbuild": ensure => installed;
-        "buildd": ensure => installed;
-        "buildd-builder-meta": ensure => installed;
-        "apt-transport-https": ensure => installed;
-        "debootstrap": ensure => installed;
-        "dupload": ensure => installed;
-    }
-   
-    file {
-        "/etc/apt/preferences.d/buildd":
-             source  => "puppet:///modules/buildd/apt-preferences",
-             before  => File["/etc/apt/sources.list.d/buildd.list"],
-             ;
-
-        "/etc/apt/sources.list.d/buildd.list":
-             content => template("buildd/etc/apt/sources.list.d/buildd.list.erb"),
-             require => Package["apt-transport-https"],
-             notify  => Exec["apt-get update"],
-             ;
-       
-        "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
-             source  => "puppet:///modules/buildd/buildd.debian.org.asc",
-             mode    => 664,
-             notify  => Exec["apt-keys-update"],
-             ;
-        "/etc/schroot/mount-defaults":
-             content => template("buildd/etc/schroot/mount-defaults.erb"),
-             require => Package["sbuild"]
-             ;
-        "/etc/cron.d/dsa-buildd":
-             source => "puppet:///modules/buildd/cron.d-dsa-buildd",
-             require => Package["debian.org"]
-             ;
-        "/etc/dupload.conf":
-             source => "puppet:///modules/buildd/dupload.conf",
-             require => Package["dupload"]
-             ;
-        "/etc/default/schroot":
-             source => "puppet:///modules/buildd/default-schroot",
-             require => Package["schroot"]
-             ;
-    }
-
-    case $kernel {
-        Linux: { linux_module { "dm_snapshot": ensure => present; } }
-    }
+class buildd ($ensure=present) {
 
+       include schroot
+
+       package { 'sbuild':
+               ensure => installed,
+               tag    => extra_repo,
+       }
+       package { 'libsbuild-perl':
+               ensure => installed,
+               tag    => extra_repo,
+               before => Package['sbuild']
+       }
+
+       package { 'apt-transport-https':
+               ensure => installed,
+       }
+       if $ensure == present {
+               package { 'dupload':
+                       ensure => installed,
+               }
+               file { '/etc/dupload.conf':
+                       source  => 'puppet:///modules/buildd/dupload.conf',
+                       require => Package['dupload'],
+               }
+               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  => Site::Aptrepo['buildd.debian.org']
+       }
+       file { '/etc/cron.d/dsa-buildd':
+               source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
+               require => Package['debian.org']
+       }
+
+       if $::lsbmajdistrelease >= 7 {
+               package { 'python-psutil':
+                       ensure => installed,
+               }
+               file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+                       source  => 'puppet:///modules/buildd/dupload.conf',
+                       mode    => '0555',
+               }
+               file { '/etc/cron.d/puppet-buildd-aptitude':
+                       content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+               }
+       }
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: