projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename debian-cdn to debian2 so it sorts after debian.list
[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
168b03f
..
2ea9e15
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-13,11
+13,6
@@
class debian-org {
$mirror = 'http://deb.debian.org/debian/'
}
}
$mirror = 'http://deb.debian.org/debian/'
}
}
- if $::lsbmajdistrelease < 7 {
- $mirror_backports = 'http://backports.debian.org/debian-backports/'
- } else {
- $mirror_backports = $mirror
- }
if $::lsbmajdistrelease <= 7 {
$mungedcodename = $::lsbdistcodename
if $::lsbmajdistrelease <= 7 {
$mungedcodename = $::lsbdistcodename
@@
-68,10
+63,8
@@
class debian-org {
if ($::lsbmajdistrelease >= 8) {
$rubyfs_package = 'ruby-filesystem'
if ($::lsbmajdistrelease >= 8) {
$rubyfs_package = 'ruby-filesystem'
- } elsif $::lsbmajdistrelease == 7 {
- $rubyfs_package = 'libfilesystem-ruby1.9'
} else {
} else {
- $rubyfs_package = 'libfilesystem-ruby1.
8
'
+ $rubyfs_package = 'libfilesystem-ruby1.
9
'
}
package { [
'apt-utils',
}
package { [
'apt-utils',
@@
-143,20
+136,12
@@
class debian-org {
suite => "${mungedcodename}/updates",
components => ['main','contrib','non-free']
}
suite => "${mungedcodename}/updates",
components => ['main','contrib','non-free']
}
- if $::lsbmajdistrelease < 7 {
- site::aptrepo { 'debian-lts':
- url => $mirror,
- suite => "${::lsbdistcodename}-lts",
- components => ['main','contrib','non-free']
- }
- } else {
- site::aptrepo { 'debian-lts':
- ensure => absent,
- }
+ site::aptrepo { 'debian-lts':
+ ensure => absent,
}
site::aptrepo { 'backports.debian.org':
}
site::aptrepo { 'backports.debian.org':
- url => $mirror
_backports
,
+ url => $mirror,
suite => "${::lsbdistcodename}-backports",
components => ['main','contrib','non-free']
}
suite => "${::lsbdistcodename}-backports",
components => ['main','contrib','non-free']
}
@@
-167,10
+152,10
@@
class debian-org {
components => ['main','contrib','non-free']
}
components => ['main','contrib','non-free']
}
- if ($::hostname in []) {
+ 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 {
@@
-212,6
+197,15
@@
class debian-org {
components => ['main','contrib','non-free']
}
}
components => ['main','contrib','non-free']
}
}
+ site::aptrepo { 'debian-cdn':
+ ensure => absent,
+ }
+
+ site::aptrepo { 'debian2':
+ url => "http://cdn-fastly.deb.debian.org/debian",
+ suite => $mungedcodename,
+ components => ['main','contrib','non-free']
+ }
file { '/etc/facter':
ensure => directory,
file { '/etc/facter':
ensure => directory,