use local mirrors less

[mirror/dsa-puppet.git] / modules / debian_org / manifests / apt.pp

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 90ac4fb..076463c 100644 (file)
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -10,9 +10,9 @@ class debian_org::apt {
        }
 
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-               $mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror, 'http://debian.anycast-test.mirrors.debian.org/debian/' ]
+               $mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror ]
        } else {
-               $mirror = [ $fallbackmirror, 'http://debian.anycast-test.mirrors.debian.org/debian/' ]
+               $mirror = [ $fallbackmirror ]
        }
 
        site::aptrepo { 'debian':
@@ -21,21 +21,34 @@ class debian_org::apt {
                components => ['main','contrib','non-free']
        }
 
-       if ($::hostname in [smetana]) {
+       if versioncmp($::lsbmajdistrelease, '8') <= 0 {
                site::aptrepo { 'security':
-                       ensure => absent,
+                       url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
+                       suite      => "${::lsbdistcodename}/updates",
+                       components => ['main','contrib','non-free']
                }
        } else {
                site::aptrepo { 'security':
-                       url        => [ 'http://security-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ],
+                       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 {
+               # 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',
+               url        => 'https://db.debian.org/debian-admin',
                suite      => $dbdosuites,
                components => 'main',
                key        => 'puppet:///modules/debian_org/db.debian.org.gpg',