projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable proposed repo on zandonai
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
41805fe
..
4fd831e
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-23,6
+23,13
@@
class buildd ($ensure=present) {
source => 'puppet:///modules/buildd/dupload.conf',
require => Package['dupload'],
}
source => 'puppet:///modules/buildd/dupload.conf',
require => Package['dupload'],
}
+ package { 'buildd':
+ ensure => installed,
+ }
+ file { '/etc/buildd/buildd.conf':
+ source => 'puppet:///modules/buildd/buildd.conf',
+ require => Package['buildd'],
+ }
site::linux_module { 'dm_snapshot': }
include ferm::ftp_conntrack
}
site::linux_module { 'dm_snapshot': }
include ferm::ftp_conntrack
}
@@
-40,16
+47,21
@@
class buildd ($ensure=present) {
default => 'wheezy'
}
default => 'wheezy'
}
+ $buildd_apt_url = $::debarchitecture ? {
+ /^sparc$/ => 'http://buildd.debian.org/apt/',
+ default => 'https://buildd.debian.org/apt/',
+ }
+
site::aptrepo { 'buildd.debian.org':
key => 'puppet:///modules/buildd/buildd.debian.org.gpg',
site::aptrepo { 'buildd.debian.org':
key => 'puppet:///modules/buildd/buildd.debian.org.gpg',
- url =>
'https://buildd.debian.org/apt/'
,
+ url =>
$buildd_apt_url
,
suite => $suite,
components => 'main',
require => Package['apt-transport-https'],
}
$buildd_prop_ensure = $::hostname ? {
suite => $suite,
components => 'main',
require => Package['apt-transport-https'],
}
$buildd_prop_ensure = $::hostname ? {
- /^(alkman
|zandonai
)$/ => 'present',
+ /^(alkman)$/ => 'present',
default => 'absent',
}
default => 'absent',
}