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:
d3eaac2
)
Use https to access the db.d.o repo
author
Julien Cristau
<jcristau@debian.org>
Wed, 28 Nov 2018 10:30:56 +0000
(11:30 +0100)
committer
Julien Cristau
<jcristau@debian.org>
Wed, 28 Nov 2018 10:30:56 +0000
(11:30 +0100)
modules/debian_org/manifests/apt.pp
patch
|
blob
|
history
diff --git
a/modules/debian_org/manifests/apt.pp
b/modules/debian_org/manifests/apt.pp
index
32a1fa8
..
076463c
100644
(file)
--- a/
modules/debian_org/manifests/apt.pp
+++ b/
modules/debian_org/manifests/apt.pp
@@
-35,9
+35,20
@@
class debian_org::apt {
}
}
}
}
+ # ca-certificates is installed by the ssl module
+ if versioncmp($::lsbmajdistrelease, '9') <= 0 {
+ package { 'apt-transport-https':
+ ensure => installed,
+ }
+ } else {
+ # transitional package in buster
+ package { 'apt-transport-https':
+ ensure => purged,
+ }
+ }
$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
site::aptrepo { 'db.debian.org':
$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
site::aptrepo { 'db.debian.org':
- url => 'http://db.debian.org/debian-admin',
+ url => 'http
s
://db.debian.org/debian-admin',
suite => $dbdosuites,
components => 'main',
key => 'puppet:///modules/debian_org/db.debian.org.gpg',
suite => $dbdosuites,
components => 'main',
key => 'puppet:///modules/debian_org/db.debian.org.gpg',