From 131d37546ae69da34954021b037c592a7b738b46 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 7 Sep 2019 19:21:10 +0200 Subject: [PATCH] Try to retire the site module: move site::alternative to base --- modules/{site => base}/manifests/alternative.pp | 2 +- modules/debian_org/manifests/init.pp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename modules/{site => base}/manifests/alternative.pp (89%) diff --git a/modules/site/manifests/alternative.pp b/modules/base/manifests/alternative.pp similarity index 89% rename from modules/site/manifests/alternative.pp rename to modules/base/manifests/alternative.pp index 2853e11d9..da86db331 100644 --- a/modules/site/manifests/alternative.pp +++ b/modules/base/manifests/alternative.pp @@ -1,4 +1,4 @@ -define site::alternative ($linkto, $ensure = present) { +define base::alternative ($linkto, $ensure = present) { case $ensure { present: { exec { "/usr/bin/update-alternatives --set ${name} ${linkto}": 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': -- 2.20.1