Try to retire the site module: move site::aptrepo to base

[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 d52005f..8ff0877 100644 (file)
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -17,14 +17,14 @@ class debian_org::apt {
 
        # jessie
        if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-               site::aptrepo { 'debian':
+               base::aptrepo { 'debian':
                        url        => $mirror,
                        suite      => [ $::lsbdistcodename ],
                        components => ['main','contrib','non-free']
                }
        # stretch or buster
        } else {
-               site::aptrepo { 'debian':
+               base::aptrepo { 'debian':
                        url        => $mirror,
                        suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
                        components => ['main','contrib','non-free']
@@ -32,13 +32,13 @@ class debian_org::apt {
        }
 
        if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-               site::aptrepo { 'security':
+               base::aptrepo { 'security':
                        url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
                        suite      => "${::lsbdistcodename}/updates",
                        components => ['main','contrib','non-free']
                }
        } else {
-               site::aptrepo { 'security':
+               base::aptrepo { 'security':
                        url        => [ 'http://security.debian.org/' ],
                        suite      => "${::lsbdistcodename}/updates",
                        components => ['main','contrib','non-free']
@@ -57,7 +57,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',
@@ -65,39 +65,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,
        }