X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=79065a17c45a28aa501df88b96bc9c3ee90f3c4a;hb=6e991e41c587e8e276825afaa174d6420c1d4e9d;hp=0593e2bff4337d283064ea17660f1d8cdf3d4311;hpb=fefd159d4cb1240c3d154263cce062929d368319;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 0593e2bff..79065a17c 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,39 +1,50 @@
 class buildd {
-    package {
-        "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/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["cron"]
-             ;
-        "/etc/dupload.conf":
-             source => "puppet:///modules/buildd/dupload.conf",
-             require => Package["dupload"]
-             ;
-    }
+
+	# sigh, sort this mess out, kids
+	if $::lsbdistcodename in [lenny,squeeze] {
+		package { 'schroot': ensure => installed }
+	} else {
+		package { 'schroot': ensure => held }
+	}
+
+	package { [
+			'sbuild',
+			'apt-transport-https',
+			'debootstrap',
+			'dupload'
+		]:
+			ensure => installed
+	}
+
+	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',
+	}
+
+	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/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: