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 (file)
index 0000000..da86db3
--- /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 02c8c7a..63a92fd 100644 (file)
--- 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 (file)
index 2853e11..0000000
--- 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'" ) }
-       }
-}