massive style guide fixups

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 8f68e6905f2469c46074cd49e9a011a58b8965c5..01dca34d5b315b03a4238547d82b90b34743ff3b 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,22 +1,43 @@
 class buildd {
-   package {
-     "sbuild": ensure => installed;
-     "buildd": ensure => installed;
-     "buildd-builder-meta": ensure => installed;
-     "apt-transport-https": ensure => installed;
-     "debootstrap": ensure => installed;
-   }
+       package { [
+                       'schroot',
+                       'sbuild',
+                       'apt-transport-https',
+                       'debootstrap',
+                       'dupload'
+               ]:
+                       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"]
-             ;
+       site::linux_module { 'dm_snapshot': }
+
+       site::aptrepo { 'buildd':
+               content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
+               key     => 'puppet:///modules/buildd/buildd.debian.org.asc',
+       }
+
+       file { '/etc/apt/preferences.d/buildd':
+               ensure  => absent
+       }
+       file { '/etc/schroot/mount-defaults':
+               content => template('buildd/etc/schroot/mount-defaults.erb'),
+               require => Package['sbuild'],
+       }
+       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"],
-          ;
-   }
 }