X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=efde37bde3198b416226c095ce8c592841305465;hb=8fd87401b5b7cb84eba0b83c17d07fddb2465d6d;hp=6c8a729da75839df12346147236e2ca983a18eb8;hpb=9f55dcc547cde34779c8919757f90f4d3a5fd415;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 6c8a729da..efde37bde 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,27 +1,88 @@
 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":
-             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:///buildd/buildd.debian.org.asc",
-            mode    => 664,
-            notify  => Exec["apt-keys-update"],
-            ;
-      "/etc/schroot/mount-defaults":
-            source  => "puppet:///buildd/mount-defaults",
-            require => Package["sbuild"]
-            ;
-   }
+
+	package { [
+			'schroot',
+			'sbuild'
+		]:
+		ensure  => installed,
+		require => [
+			Exec['apt-get update']
+		]
+	}
+
+	package { 'apt-transport-https':
+		ensure => installed,
+	}
+	package { [
+			'debootstrap',
+			'dupload'
+		]:
+		ensure => installed,
+	}
+
+	site::linux_module { 'dm_snapshot': }
+	ferm::module { 'nf_conntrack_ftp': }
+
+	site::aptrepo { 'buildd':
+		ensure => absent,
+	}
+
+	$suite = $::lsbdistcodename ? {
+		squeeze => $::lsbdistcodename,
+		wheezy  => $::lsbdistcodename,
+		undef   => 'squeeze',
+		default => 'wheezy'
+	}
+
+	site::aptrepo { 'buildd.debian.org':
+		key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+		url        => 'https://buildd.debian.org/apt/',
+		suite      => $suite,
+		components => 'main',
+		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'],
+		}
+	}
+
+	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'],
+		}
+	}
+
+	# '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  => Site::Aptrepo['buildd.debian.org']
+	}
+	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']
+	}
+
 }