projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a little more mucking about with the buildd repo
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
e41e5ac
..
0835e57
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-1,19
+1,20
@@
class buildd {
class buildd {
- # sigh, sort this mess out, kids
- if $::lsbdistcodename in [lenny,squeeze] {
- package { 'schroot':
- ensure => installed,
- }
- } else {
- package { 'schroot': }
+ package { [
+ 'schroot',
+ 'sbuild'
+ ]:
+ ensure => installed,
+ require => [
+ File['etc/apt/sources.list.d/buildd.debian.org.list'],
+ Exec['apt-get update']
+ ]
}
package { 'apt-transport-https':
ensure => installed,
}
package { [
}
package { 'apt-transport-https':
ensure => installed,
}
package { [
- 'sbuild',
'debootstrap',
'dupload'
]:
'debootstrap',
'dupload'
]:
@@
-36,14
+37,17
@@
class buildd {
require => Package['apt-transport-https'],
}
require => Package['apt-transport-https'],
}
- #
"bad"
extension
+ #
'bad'
extension
file { '/etc/apt/preferences.d/buildd.debian.org':
ensure => absent,
}
file { '/etc/apt/preferences.d/buildd.debian.org':
ensure => absent,
}
+ file { '/etc/apt/preferences.d':
+ ensure => directory,
+ mode => '0755'
+ }
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 => File['etc/apt/sources.list.d/buildd.debian.org.list']
}
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'),