From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 17:21:10 +0000 (+0200)
Subject: Try to retire the site module: move site::alternative to base
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=131d37546ae69da34954021b037c592a7b738b46;p=mirror%2Fdsa-puppet.git

Try to retire the site module: move site::alternative to base
---

diff --git a/modules/base/manifests/alternative.pp b/modules/base/manifests/alternative.pp
new file mode 100644
index 000000000..da86db331
--- /dev/null
+++ b/modules/base/manifests/alternative.pp
@@ -0,0 +1,15 @@
+define base::alternative ($linkto, $ensure = present) {
+	case $ensure {
+		present: {
+			exec { "/usr/bin/update-alternatives --set ${name} ${linkto}":
+				unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') = ${linkto} ]",
+			}
+		}
+		absent: {
+			exec { "/usr/bin/update-alternatives --remove ${name} ${linkto}":
+				unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]",
+			}
+		}
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
+	}
+}
diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 02c8c7ace..63a92fd2e 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -251,10 +251,10 @@ class debian_org {
 		key   => 'vm.vfs_cache_pressure',
 		value => '10',
 	}
-	site::alternative { 'editor':
+	base::alternative { 'editor':
 		linkto => '/usr/bin/vim.basic',
 	}
-	site::alternative { 'view':
+	base::alternative { 'view':
 		linkto => '/usr/bin/vim.basic',
 	}
 	mailalias { 'samhain-reports':
diff --git a/modules/site/manifests/alternative.pp b/modules/site/manifests/alternative.pp
deleted file mode 100644
index 2853e11d9..000000000
--- a/modules/site/manifests/alternative.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-define site::alternative ($linkto, $ensure = present) {
-	case $ensure {
-		present: {
-			exec { "/usr/bin/update-alternatives --set ${name} ${linkto}":
-				unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') = ${linkto} ]",
-			}
-		}
-		absent: {
-			exec { "/usr/bin/update-alternatives --remove ${name} ${linkto}":
-				unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]",
-			}
-		}
-		default: { fail ( "Unknown ensure value: '$ensure'" ) }
-	}
-}