projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d67c8f5
)
kfreebsd jessie apt sources
author
Peter Palfrader
<peter@palfrader.org>
Wed, 13 May 2015 08:16:42 +0000
(08:16 +0000)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 13 May 2015 08:16:42 +0000
(08:16 +0000)
modules/debian-org/manifests/init.pp
patch
|
blob
|
history
diff --git
a/modules/debian-org/manifests/init.pp
b/modules/debian-org/manifests/init.pp
index
dc9d272
..
ce88c13
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-14,6
+14,14
@@
class debian-org {
$mirror_backports = $mirror
}
$mirror_backports = $mirror
}
+ if $::lsbmajdistrelease <= 7 {
+ $mungedcodename = $::lsbdistcodename
+ } elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+ $mungedcodename = "${::lsbdistcodename}-kfreebsd"
+ } else {
+ $mungedcodename = $::lsbdistcodename
+ }
+
if $systemd {
include systemd
$servicefiles = 'present'
if $systemd {
include systemd
$servicefiles = 'present'
@@
-130,7
+138,7
@@
class debian-org {
site::aptrepo { 'security':
url => 'http://security.debian.org/',
site::aptrepo { 'security':
url => 'http://security.debian.org/',
- suite => "${
::lsbdist
codename}/updates",
+ suite => "${
munged
codename}/updates",
components => ['main','contrib','non-free']
}
if $::lsbmajdistrelease < 7 {
components => ['main','contrib','non-free']
}
if $::lsbmajdistrelease < 7 {
@@
-151,10
+159,16
@@
class debian-org {
components => ['main','contrib','non-free']
}
components => ['main','contrib','non-free']
}
- site::aptrepo { 'volatile':
- url => $mirror,
- suite => "${::lsbdistcodename}-updates",
- components => ['main','contrib','non-free']
+ if (($::lsbmajdistrelease) >= 8 and ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386'])) {
+ site::aptrepo { 'volatile':
+ ensure => absent,
+ }
+ } else {
+ site::aptrepo { 'volatile':
+ url => $mirror,
+ suite => "${::lsbdistcodename}-updates",
+ components => ['main','contrib','non-free']
+ }
}
#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
}
#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
@@
-199,7
+213,7
@@
class debian-org {
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
site::aptrepo { 'debian':
url => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
site::aptrepo { 'debian':
url => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
- suite => $
::lsbdist
codename,
+ suite => $
munged
codename,
components => ['main','contrib','non-free']
}
}
components => ['main','contrib','non-free']
}
}