projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow munin queries from localhost
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
bdb29eb
..
335da3f
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-1,31
+1,24
@@
class buildd {
class buildd {
- # sigh, sort this mess out, kids
- if $::lsbdistcodename in [lenny,squeeze] {
- package { 'schroot':
- ensure => installed,
- require => [
- File['/etc/apt/sources.list.d/db.debian.org.list'],
- Exec['apt-get update']
- ]
- }
- } else {
- package { 'schroot': ensure => held }
+ 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'
]:
ensure => installed,
'debootstrap',
'dupload'
]:
ensure => installed,
- require => [
- File['/etc/apt/sources.list.d/db.debian.org.list'],
- Exec['apt-get update']
- ]
}
site::linux_module { 'dm_snapshot': }
}
site::linux_module { 'dm_snapshot': }
@@
-34,19
+27,47
@@
class buildd {
site::aptrepo { 'buildd':
ensure => absent,
}
site::aptrepo { 'buildd':
ensure => absent,
}
+
+ $suite = $::lsbdistcodename ? {
+ squeeze => $::lsbdistcodename,
+ wheezy => $::lsbdistcodename,
+ undef => 'squeeze',
+ default => 'wheezy'
+ }
+
site::aptrepo { 'buildd.debian.org':
site::aptrepo { 'buildd.debian.org':
- template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
- key => 'puppet:///modules/buildd/buildd.debian.org.asc',
- require => Package['apt-transport-https'],
+ key => 'puppet:///modules/buildd/buildd.debian.org.asc',
+ url => 'https://buildd.debian.org/apt/',
+ suite => $suite,
+ components => 'main',
+ require => Package['apt-transport-https'],
}
}
- file { '/etc/apt/preferences.d/buildd':
- ensure => absent,
+ 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':
file { '/etc/apt/preferences.d/buildd.debian.org':
- content => template('buildd/etc/apt/preferences.d/buildd.debian.org'),
- before => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
- ;
+ ensure => absent,
+ }
+ 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']
}
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'),