projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare staticsync for backports
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
3a9d508
..
dcf6fe7
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-1,9
+1,7
@@
-class buildd {
+class buildd ($ensure=present) {
+
+ include schroot
- package { 'schroot':
- ensure => installed,
- tag => extra_repo,
- }
package { 'sbuild':
ensure => installed,
tag => extra_repo,
package { 'sbuild':
ensure => installed,
tag => extra_repo,
@@
-17,16
+15,18
@@
class buildd {
package { 'apt-transport-https':
ensure => installed,
}
package { 'apt-transport-https':
ensure => installed,
}
- package { [
- 'debootstrap',
- 'dupload'
- ]:
- ensure => installed,
+ if $ensure == present {
+ package { 'dupload':
+ ensure => installed,
+ }
+ file { '/etc/dupload.conf':
+ source => 'puppet:///modules/buildd/dupload.conf',
+ require => Package['dupload'],
+ }
+ site::linux_module { 'dm_snapshot': }
+ ferm::module { 'nf_conntrack_ftp': }
}
}
- site::linux_module { 'dm_snapshot': }
- ferm::module { 'nf_conntrack_ftp': }
-
site::aptrepo { 'buildd':
ensure => absent,
}
site::aptrepo { 'buildd':
ensure => absent,
}
@@
-72,21
+72,8
@@
class buildd {
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':
- 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/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']
- }
-
}
}