From 9c6e5abb124b6664dea47f2637e431286433b677 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 19:23:03 +0200
Subject: [PATCH] Try to retire the site module: move site::aptrepo to base

---
 modules/{site => base}/manifests/aptrepo.pp   |  4 +--
 modules/{site => base}/templates/aptrepo.erb  |  0
 modules/debian_org/manifests/apt.pp           | 30 +++++++++----------
 .../debian_org/manifests/apt_restricted.pp    |  2 +-
 modules/hardware/manifests/raid/dell.pp       |  4 +--
 .../hardware/manifests/raid/megaraid_sas.pp   |  2 +-
 modules/hardware/manifests/raid/proliant.pp   |  4 +--
 7 files changed, 23 insertions(+), 23 deletions(-)
 rename modules/{site => base}/manifests/aptrepo.pp (90%)
 rename modules/{site => base}/templates/aptrepo.erb (100%)

diff --git a/modules/site/manifests/aptrepo.pp b/modules/base/manifests/aptrepo.pp
similarity index 90%
rename from modules/site/manifests/aptrepo.pp
rename to modules/base/manifests/aptrepo.pp
index 148f9cf0b..f7c81fc2b 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/base/manifests/aptrepo.pp
@@ -1,4 +1,4 @@
-define site::aptrepo (
+define base::aptrepo (
 	$url='',
 	$suite='',
 	$components=[],
@@ -36,7 +36,7 @@ define site::aptrepo (
 
 	file { "/etc/apt/sources.list.d/${name}.list":
 		ensure  => $ensure,
-		content => template('site/aptrepo.erb'),
+		content => template('base/aptrepo.erb'),
 		notify  => Exec['apt-get update'],
 	}
 }
diff --git a/modules/site/templates/aptrepo.erb b/modules/base/templates/aptrepo.erb
similarity index 100%
rename from modules/site/templates/aptrepo.erb
rename to modules/base/templates/aptrepo.erb
diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index d52005f80..8ff087746 100644
--- 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,
 	}
 
diff --git a/modules/debian_org/manifests/apt_restricted.pp b/modules/debian_org/manifests/apt_restricted.pp
index 9b1126e14..b76d5b094 100644
--- a/modules/debian_org/manifests/apt_restricted.pp
+++ b/modules/debian_org/manifests/apt_restricted.pp
@@ -1,5 +1,5 @@
 class debian_org::apt_restricted {
-	site::aptrepo { 'db.debian.org.restricted':
+	base::aptrepo { 'db.debian.org.restricted':
 		url        => 'https://db.debian.org/debian-admin',
 		suite      => "${::lsbdistcodename}-restricted",
 		components => 'non-free',
diff --git a/modules/hardware/manifests/raid/dell.pp b/modules/hardware/manifests/raid/dell.pp
index c654f4745..277fa2d85 100644
--- a/modules/hardware/manifests/raid/dell.pp
+++ b/modules/hardware/manifests/raid/dell.pp
@@ -22,10 +22,10 @@ class hardware::raid::dell {
 			ensure => installed,
 		}
 	}
-	site::aptrepo { 'jessie.dell':
+	base::aptrepo { 'jessie.dell':
 		ensure => absent,
 	}
-	site::aptrepo { 'debian.restricted.dell':
+	base::aptrepo { 'debian.restricted.dell':
 		ensure => absent,
 	}
 }
diff --git a/modules/hardware/manifests/raid/megaraid_sas.pp b/modules/hardware/manifests/raid/megaraid_sas.pp
index bb5172e9b..f208682cc 100644
--- a/modules/hardware/manifests/raid/megaraid_sas.pp
+++ b/modules/hardware/manifests/raid/megaraid_sas.pp
@@ -18,7 +18,7 @@ class hardware::raid::megaraid_sas {
 			ensure => 'absent',
 		}
 	}
-	site::aptrepo { 'debian.restricted.megaraid_sas':
+	base::aptrepo { 'debian.restricted.megaraid_sas':
 		ensure => absent,
 	}
 }
diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index afc709138..305cfc4ae 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,6 +1,6 @@
 class hardware::raid::proliant {
 	if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
-		site::aptrepo { 'debian.restricted':
+		base::aptrepo { 'debian.restricted':
 			ensure => absent,
 		}
 		include debian_org::apt_restricted
@@ -44,7 +44,7 @@ class hardware::raid::proliant {
 		}
 		file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
 	} else {
-		site::aptrepo { 'debian.restricted':
+		base::aptrepo { 'debian.restricted':
 			ensure => absent,
 		}
 	}
-- 
2.20.1