no more lenny

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 7977b11ad80b2a9cbe1af839a8aced895beb43ed..63c5cf8acc24b49e2e750286f1f3a5b9bca0a62a 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,27 +1,65 @@
 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 => "puppet:///files/etc/apt/sources.list.d/buildd.list",
-             require => Package["apt-transport-https"],
-             notify  => Exec["apt-get update"],
-             ;
+       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,
+               require => [
+                       File['/etc/apt/sources.list.d/db.debian.org.list'],
+                       Exec['apt-get update']
+               ]
+       }
+
+       site::linux_module { 'dm_snapshot': }
+       ferm::module { 'nf_conntrack_ftp': }
+
+       site::aptrepo { 'buildd':
+               ensure => absent,
+       }
+       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'],
+       }
+
+       # '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']
+       }
 
-      "/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"]
-            ;
-   }
 }