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 f001291bd33f9d34ede22fc61b27856f4bbe21ad..01dca34d5b315b03a4238547d82b90b34743ff3b 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,51 +1,43 @@
 class buildd {
-    package {
-        "schroot": ensure => installed;
-        "sbuild": ensure => installed;
-        "apt-transport-https": ensure => installed;
-        "debootstrap": ensure => installed;
-        "dupload": ensure => installed;
-    }
+       package { [
+                       'schroot',
+                       'sbuild',
+                       'apt-transport-https',
+                       'debootstrap',
+                       'dupload'
+               ]:
+                       ensure => installed
+       }
 
-    file {
-        "/etc/apt/preferences.d/buildd":
-            ensure  => absent
-            ;
+       site::linux_module { 'dm_snapshot': }
 
-        "/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"],
-             ;
+       site::aptrepo { 'buildd':
+               content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
+               key     => 'puppet:///modules/buildd/buildd.debian.org.asc',
+       }
 
-        "/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; } }
-    }
+       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']
+       }
 
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: