projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Make it work with jessie, II"
[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
bb965be
..
de8091b
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-8,7
+8,7
@@
class debian-org {
} else {
$mirror = 'http://http.debian.net/debian/'
}
} else {
$mirror = 'http://http.debian.net/debian/'
}
- if $::lsbmajdistrelease
!= "testing" and $::lsbmajdistrelease
< 7 {
+ if $::lsbmajdistrelease < 7 {
$mirror_backports = 'http://backports.debian.org/debian-backports/'
} else {
$mirror_backports = $mirror
$mirror_backports = 'http://backports.debian.org/debian-backports/'
} else {
$mirror_backports = $mirror
@@
-60,7
+60,7
@@
class debian-org {
ensure => installed,
}
ensure => installed,
}
- if $::lsbmajdistrelease
== "testing" or $::lsbmajdistrelease
>= 7 {
+ if $::lsbmajdistrelease >= 7 {
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
@@
-122,7
+122,7
@@
class debian-org {
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}
- if $::lsbmajdistrelease
!= "testing" and $::lsbmajdistrelease
< 7 {
+ if $::lsbmajdistrelease < 7 {
site::aptrepo { 'debian-lts':
url => $mirror,
suite => "${::lsbdistcodename}-lts",
site::aptrepo { 'debian-lts':
url => $mirror,
suite => "${::lsbdistcodename}-lts",