projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
santoro to staticsync (for www)
[mirror/dsa-puppet.git]
/
modules
/
debian-org
/
manifests
/
init.pp
diff --git
a/modules/debian-org/manifests/init.pp
b/modules/debian-org/manifests/init.pp
index
c846154
..
6ac4c12
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-6,7
+6,12
@@
class debian-org {
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
} else {
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
} else {
- $mirror = 'http://ftp.debian.org/debian/'
+ #$mirror = 'http://ftp.debian.org/debian/'
+ if $::lsbmajdistrelease <= 8 {
+ $mirror = 'http://cdn-fastly.deb.debian.org/debian/'
+ } else {
+ $mirror = 'http://deb.debian.org/debian/'
+ }
}
if $::lsbmajdistrelease < 7 {
$mirror_backports = 'http://backports.debian.org/debian-backports/'
}
if $::lsbmajdistrelease < 7 {
$mirror_backports = 'http://backports.debian.org/debian-backports/'
@@
-134,7
+139,7
@@
class debian-org {
}
site::aptrepo { 'security':
}
site::aptrepo { 'security':
- url => 'http://security.debian.org/',
+ url => 'http://security
-cdn
.debian.org/',
suite => "${mungedcodename}/updates",
components => ['main','contrib','non-free']
}
suite => "${mungedcodename}/updates",
components => ['main','contrib','non-free']
}
@@
-162,10
+167,10
@@
class debian-org {
components => ['main','contrib','non-free']
}
components => ['main','contrib','non-free']
}
- if ($::hostname in [
mips-aql-05 mipsel-aql-02]) or
{
+ if ($::hostname in [
] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386'])
{
site::aptrepo { 'proposed-updates':
url => $mirror,
site::aptrepo { 'proposed-updates':
url => $mirror,
- suite => "${
::lsbdist
codename}-proposed-updates",
+ suite => "${
munged
codename}-proposed-updates",
components => ['main','contrib','non-free']
}
} else {
components => ['main','contrib','non-free']
}
} else {