debian_org::apt: remove jessie support

[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 f7f113b..ea61ba0 100644 (file)
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -3,53 +3,18 @@
 # 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/'
-       }
+       $mirror = lookup('apt::sources::debian::location')
 
-       if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
-               $mirror = [ getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'), $fallbackmirror ]
-       } else {
-               $mirror = [ $fallbackmirror ]
+       base::aptrepo { 'debian':
+               url        => $mirror,
+               suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
+               components => ['main','contrib','non-free']
        }
 
-       # jessie
-       if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-               site::aptrepo { 'debian':
-                       url        => $mirror,
-                       suite      => [ $::lsbdistcodename ],
-                       components => ['main','contrib','non-free']
-               }
-       # stretch
-       } elsif versioncmp($::lsbmajdistrelease, '9') <= 0 {
-               site::aptrepo { 'debian':
-                       url        => $mirror,
-                       suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
-                       components => ['main','contrib','non-free']
-               }
-       # buster or newer
-       } else {
-               site::aptrepo { 'debian':
-                       url        => $mirror,
-                       suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-updates" ],
-                       components => ['main','contrib','non-free']
-               }
-       }
-
-       if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-               site::aptrepo { 'security':
-                       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.debian.org/' ],
-                       suite      => "${::lsbdistcodename}/updates",
-                       components => ['main','contrib','non-free']
-               }
+       base::aptrepo { 'security':
+               url        => [ 'http://security.debian.org/' ],
+               suite      => "${::lsbdistcodename}/updates",
+               components => ['main','contrib','non-free']
        }
 
        # ca-certificates is installed by the ssl module
@@ -64,7 +29,7 @@ class debian_org::apt {
                }
        }
        $dbdosuites = [ 'debian-all', $::lsbdistcodename ]
-       site::aptrepo { 'db.debian.org':
+       base::aptrepo { 'db.debian.org':
                url        => 'https://db.debian.org/debian-admin',
                suite      => $dbdosuites,
                components => 'main',
@@ -72,39 +37,39 @@ class debian_org::apt {
        }
 
        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,
        }
 
@@ -139,6 +104,14 @@ class debian_org::apt {
        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':
+               source => 'puppet:///modules/debian_org/apt.conf.d/local-pkglist',
+       }
+
+       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',