# Stuff common to all debian.org servers
#
class debian_org::apt {
- if versioncmp($::lsbmajdistrelease, '8') <= 0 {
- $fallbackmirror = 'http://cdn-fastly.deb.debian.org/debian/'
- } else {
- $fallbackmirror = 'http://deb.debian.org/debian/'
- }
-
- if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
- $mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror ]
- } else {
- $mirror = [ $fallbackmirror ]
- }
+ $mirror = lookup('apt::sources::debian::location')
- site::aptrepo { 'debian':
+ base::aptrepo { 'debian':
url => $mirror,
suite => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
components => ['main','contrib','non-free']
}
- if ($::hostname in [smetana]) {
- site::aptrepo { 'security':
- ensure => absent,
+ base::aptrepo { 'security':
+ url => [ 'http://security.debian.org/' ],
+ suite => "${::lsbdistcodename}/updates",
+ components => ['main','contrib','non-free']
+ }
+
+ # ca-certificates is installed by the ssl module
+ if versioncmp($::lsbmajdistrelease, '9') <= 0 {
+ package { 'apt-transport-https':
+ ensure => installed,
}
} else {
- site::aptrepo { 'security':
- url => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
- suite => "${::lsbdistcodename}/updates",
- components => ['main','contrib','non-free']
+ # transitional package in buster
+ package { 'apt-transport-https':
+ ensure => purged,
}
}
-
$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
- site::aptrepo { 'db.debian.org':
- url => 'http://db.debian.org/debian-admin',
+ base::aptrepo { 'db.debian.org':
+ url => 'https://db.debian.org/debian-admin',
suite => $dbdosuites,
components => 'main',
key => 'puppet:///modules/debian_org/db.debian.org.gpg',
}
if ($::hostname in []) {
- site::aptrepo { 'proposed-updates':
+ base::aptrepo { 'proposed-updates':
url => $mirror,
suite => "${::lsbdistcodename}-proposed-updates",
components => ['main','contrib','non-free']
}
} else {
- site::aptrepo { 'proposed-updates':
+ base::aptrepo { 'proposed-updates':
ensure => absent,
}
}
- site::aptrepo { 'debian-cdn':
+ base::aptrepo { 'debian-cdn':
ensure => absent,
}
- site::aptrepo { 'debian.org':
+ base::aptrepo { 'debian.org':
ensure => absent,
}
- site::aptrepo { 'debian2':
+ base::aptrepo { 'debian2':
ensure => absent,
}
- site::aptrepo { 'backports2.debian.org':
+ base::aptrepo { 'backports2.debian.org':
ensure => absent,
}
- site::aptrepo { 'backports.debian.org':
+ base::aptrepo { 'backports.debian.org':
ensure => absent,
}
- site::aptrepo { 'volatile':
+ base::aptrepo { 'volatile':
ensure => absent,
}
- site::aptrepo { 'db.debian.org-suite':
+ base::aptrepo { 'db.debian.org-suite':
ensure => absent,
}
- site::aptrepo { 'debian-lts':
+ base::aptrepo { 'debian-lts':
ensure => absent,
}
file { '/etc/apt/apt.conf.d/local-langs':
source => 'puppet:///modules/debian_org/apt.conf.d/local-langs',
}
+ file { '/etc/apt/apt.conf.d/local-cainfo':
+ source => 'puppet:///modules/debian_org/apt.conf.d/local-cainfo',
+ }
+ file { '/etc/apt/apt.conf.d/local-pkglist':
+ ensure => 'absent',
+ }
+
+ exec { 'dpkg list':
+ command => 'dpkg-query -W -f \'${Package}\n\' > /var/lib/misc/thishost/pkglist',
+ creates => '/var/lib/misc/thishost/pkglist',
+ }
exec { 'apt-get update':
path => '/usr/bin:/usr/sbin:/bin:/sbin',