projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more bacula mail, but to bacula-reports@d.o
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
d00197b
..
3a9d508
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-1,13
+1,17
@@
class buildd {
class buildd {
- package { [
- 'schroot',
- 'sbuild'
- ]:
- ensure => installed,
- require => [
- Exec['apt-get update']
- ]
+ package { 'schroot':
+ ensure => installed,
+ tag => extra_repo,
+ }
+ package { 'sbuild':
+ ensure => installed,
+ tag => extra_repo,
+ }
+ package { 'libsbuild-perl':
+ ensure => installed,
+ tag => extra_repo,
+ before => Package['sbuild']
}
package { 'apt-transport-https':
}
package { 'apt-transport-https':
@@
-40,7
+44,6
@@
class buildd {
suite => $suite,
components => 'main',
require => Package['apt-transport-https'],
suite => $suite,
components => 'main',
require => Package['apt-transport-https'],
- before => Package[schroot,sbuild]
}
if $::hostname in [alkman,porpora,zandonai] {
}
if $::hostname in [alkman,porpora,zandonai] {
@@
-67,7
+70,7
@@
class buildd {
}
file { '/etc/apt/preferences.d/buildd':
content => template('buildd/etc/apt/preferences.d/buildd'),
}
file { '/etc/apt/preferences.d/buildd':
content => template('buildd/etc/apt/preferences.d/buildd'),
- before =>
File['/etc/apt/sources.list.d/buildd.debian.org.list
']
+ before =>
Site::Aptrepo['buildd.debian.org
']
}
file { '/etc/schroot/mount-defaults':
content => template('buildd/etc/schroot/mount-defaults.erb'),
}
file { '/etc/schroot/mount-defaults':
content => template('buildd/etc/schroot/mount-defaults.erb'),