projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove debian.fi
[mirror/dsa-puppet.git]
/
modules
/
debian_org
/
manifests
/
apt.pp
diff --git
a/modules/debian_org/manifests/apt.pp
b/modules/debian_org/manifests/apt.pp
index
90ac4fb
..
32a1fa8
100644
(file)
--- a/
modules/debian_org/manifests/apt.pp
+++ b/
modules/debian_org/manifests/apt.pp
@@
-10,9
+10,9
@@
class debian_org::apt {
}
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
}
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
- $mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror
, 'http://debian.anycast-test.mirrors.debian.org/debian/'
]
+ $mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror ]
} else {
} else {
- $mirror = [ $fallbackmirror
, 'http://debian.anycast-test.mirrors.debian.org/debian/'
]
+ $mirror = [ $fallbackmirror ]
}
site::aptrepo { 'debian':
}
site::aptrepo { 'debian':
@@
-21,13
+21,15
@@
class debian_org::apt {
components => ['main','contrib','non-free']
}
components => ['main','contrib','non-free']
}
- if
($::hostname in [smetana])
{
+ if
versioncmp($::lsbmajdistrelease, '8') <= 0
{
site::aptrepo { 'security':
site::aptrepo { 'security':
- ensure => absent,
+ url => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
+ suite => "${::lsbdistcodename}/updates",
+ components => ['main','contrib','non-free']
}
} else {
site::aptrepo { 'security':
}
} else {
site::aptrepo { 'security':
- url => [ 'http://security
-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security
.debian.org/' ],
+ url => [ 'http://security.debian.org/' ],
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}