work around the missing python-psutil on kfreebsd

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 02231fe5ea5baf576e4b12cb7e871d2f8577a0d8..e0a5ad838201be4f9fdd3f8ee2da546840183581 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -46,22 +46,26 @@ class buildd ($ensure=present) {
                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'],
-               }
+       site::aptrepo { 'buildd.debian.org-proposed':
+               ensure     => $::hostname ? {
+                                            /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+                                            default => 'absent',
+                                           },
+               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'],
-               }
+       site::aptrepo { 'buildd.debian.org-experimental':
+               ensure     => $::hostname ? {
+                                            /^(krenek)$/ => 'present',
+                                            default => 'absent',
+                                           },
+               url        => 'https://buildd.debian.org/apt/',
+               suite      => "${suite}-experimental",
+               components => 'main',
+               require    => Package['apt-transport-https'],
        }
 
        # 'bad' extension
@@ -77,7 +81,7 @@ class buildd ($ensure=present) {
                require => Package['debian.org']
        }
 
-       if $::lsbmajdistrelease >= 7 {
+       if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
                package { 'python-psutil':
                        ensure => installed,
                }
@@ -85,8 +89,13 @@ class buildd ($ensure=present) {
                        source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
                        mode    => '0555',
                }
-               file { '/etc/cron.d/puppet-buildd-aptitude':
-                       content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+       } else {
+               file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+                       source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
+                       mode    => '0555',
                }
        }
+       file { '/etc/cron.d/puppet-buildd-aptitude':
+               content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+       }
 }