projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
factor out schroot
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
2786d35
..
dcf6fe7
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-1,46
+1,30
@@
class buildd ($ensure=present) {
class buildd ($ensure=present) {
- $package_ensure = $ensure ? {
- present => installed,
- absent => $ensure
- }
+ include schroot
- package { 'schroot':
- ensure => $package_ensure,
- tag => extra_repo,
- }
package { 'sbuild':
package { 'sbuild':
- ensure =>
$package_ensure
,
+ ensure =>
installed
,
tag => extra_repo,
}
package { 'libsbuild-perl':
tag => extra_repo,
}
package { 'libsbuild-perl':
- ensure =>
$package_ensure
,
+ ensure =>
installed
,
tag => extra_repo,
before => Package['sbuild']
}
package { 'apt-transport-https':
tag => extra_repo,
before => Package['sbuild']
}
package { 'apt-transport-https':
- ensure =>
$package_ensure
,
+ ensure =>
installed
,
}
if $ensure == present {
}
if $ensure == present {
- package { [
- 'debootstrap',
- 'dupload'
- ]:
+ package { 'dupload':
ensure => installed,
}
file { '/etc/dupload.conf':
ensure => installed,
}
file { '/etc/dupload.conf':
- ensure => $ensure,
source => 'puppet:///modules/buildd/dupload.conf',
require => Package['dupload'],
}
source => 'puppet:///modules/buildd/dupload.conf',
require => Package['dupload'],
}
- }
-
- site::linux_module { 'dm_snapshot':
- ensure => $ensure
- }
- ferm::module { 'nf_conntrack_ftp':
- ensure => $ensure
+ site::linux_module { 'dm_snapshot': }
+ ferm::module { 'nf_conntrack_ftp': }
}
site::aptrepo { 'buildd':
}
site::aptrepo { 'buildd':
@@
-55,7
+39,6
@@
class buildd ($ensure=present) {
}
site::aptrepo { 'buildd.debian.org':
}
site::aptrepo { 'buildd.debian.org':
- ensure => $ensure,
key => 'puppet:///modules/buildd/buildd.debian.org.asc',
url => 'https://buildd.debian.org/apt/',
suite => $suite,
key => 'puppet:///modules/buildd/buildd.debian.org.asc',
url => 'https://buildd.debian.org/apt/',
suite => $suite,
@@
-86,23
+69,11
@@
class buildd ($ensure=present) {
ensure => absent,
}
file { '/etc/apt/preferences.d/buildd':
ensure => absent,
}
file { '/etc/apt/preferences.d/buildd':
- ensure => $ensure,
content => template('buildd/etc/apt/preferences.d/buildd'),
before => Site::Aptrepo['buildd.debian.org']
}
content => template('buildd/etc/apt/preferences.d/buildd'),
before => Site::Aptrepo['buildd.debian.org']
}
- file { '/etc/schroot/mount-defaults':
- ensure => $ensure,
- content => template('buildd/etc/schroot/mount-defaults.erb'),
- require => Package['sbuild'],
- }
file { '/etc/cron.d/dsa-buildd':
file { '/etc/cron.d/dsa-buildd':
- ensure => $ensure,
source => 'puppet:///modules/buildd/cron.d-dsa-buildd',
require => Package['debian.org']
}
source => 'puppet:///modules/buildd/cron.d-dsa-buildd',
require => Package['debian.org']
}
- file { '/etc/default/schroot':
- ensure => $ensure,
- source => 'puppet:///modules/buildd/default-schroot',
- require => Package['schroot']
- }
}
}