From 7055e743c6d55dcbf9303b6564e37d1f8222f7a0 Mon Sep 17 00:00:00 2001
From: Thomas Bellman <bellman@lysator.liu.se>
Date: Mon, 4 May 2020 22:18:45 +0200
Subject: [PATCH] Track splitting of nsc-puppet-utils module.
We used some definitions, resource types and facts from the module
nsc-puppet-utils. That module has been refactored, renamed to
"nscutils", and split into multiple modules, so we need to track
those changes. We use resource types and definitions for editing
config files, which have been moved to the new module "cfgfile",
and the custom fact 'initsystem', which at the moment is still left
in the "nscutils" module.
---
README | 15 ++++++++++-----
manifests/keymap/default.pp | 8 ++++----
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/README b/README
index 9c93178..3429923 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
This is a Puppet module for managing Linux consoles and terminal logins.
-Copyright © 2017 Thomas Bellman, Linköping, Sweden.
+Copyright © 2017-2020 Thomas Bellman, Linköping, Sweden.
===== LICENSING =====
@@ -22,12 +22,17 @@ If not, see <http://www.gnu.org/licenses/>.
===== DEPENDENCIES =====
-- nsc-puppet-utils
- Needed for the 'initsystem' fact.
- Can be found at git://www.nsc.liu.se/~bellman/puppet/nsc-puppet-utils.git.
+- nscutils
+ Can be found at https://gitlab.liu.se/NSC/puppetmodules/nscutils.git.
+
+- cfgfile
+ Can be found at https://gitlab.liu.se/NSC/puppetmodules/cfgfile.git.
+
+- bootloader
+ Can be found at https://git.lysator.liu.se/bellman/puppet-bootloader.git.
===== OFFICIAL SOURCE =====
-This module is not published anywhere yet.
+https://git.lysator.liu.se/bellman/puppet-console
diff --git a/manifests/keymap/default.pp b/manifests/keymap/default.pp
index d2e11c8..2df9166 100644
--- a/manifests/keymap/default.pp
+++ b/manifests/keymap/default.pp
@@ -1,4 +1,4 @@
-# Copyright © 2017 Thomas Bellman, Linköping, Sweden
+# Copyright © 2017-2020 Thomas Bellman, Linköping, Sweden
# Licensed under the GNU LGPL v3+; see the README file for more information.
@@ -30,7 +30,7 @@ class console::keymap::default(
case "${::osfamily}:${::operatingsystem}:${::initsystem}"
{
/^[^:]+:Gentoo:openrc$/: {
- gentoo_conf {
+ cfgfile::gentoo::conf_option {
'console::keymap::default::default_keymap':
subsystem => 'keymaps',
option => 'keymap', value => $keymap;
@@ -38,7 +38,7 @@ class console::keymap::default(
}
/^RedHat:[^:]+:systemd$/: {
- config_option {
+ cfgfile::config_option {
'console::keymap::default::default_keymap':
file => '/etc/vconsole.conf',
option => 'KEYMAP', value => "\"${keymap}\"",
@@ -62,7 +62,7 @@ class console::keymap::default(
}
/^RedHat:[^:]+:(sysvinit|upstart)/: {
- rh_sysconfig {
+ cfgfile::redhat::sysconfig {
default-keymap:
subsystem => 'keyboard',
setting => 'KEYTABLE', value => $keymap;
--
GitLab