From d01536c50f195a0bd8e4ed170df78a8acc4b6484 Mon Sep 17 00:00:00 2001 From: Phil Friderici Date: Tue, 27 Jun 2023 12:43:07 +0000 Subject: [PATCH 1/2] Add support for RedHat 9 & Co --- REFERENCE.md | 1 + data/os/RedHat/9.yaml | 23 +++++++++++++++++++++++ manifests/init.pp | 1 + metadata.json | 12 ++++++++---- spec/classes/init_spec.rb | 12 ++++++++++++ 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 data/os/RedHat/9.yaml diff --git a/REFERENCE.md b/REFERENCE.md index feee562..3114bbb 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -28,6 +28,7 @@ This module has been tested to work on the following systems: * EL 6 * EL 7 * EL 8 + * EL 9 * Solaris 10 * Suse 10 * Suse 11 diff --git a/data/os/RedHat/9.yaml b/data/os/RedHat/9.yaml new file mode 100644 index 0000000..d292c80 --- /dev/null +++ b/data/os/RedHat/9.yaml @@ -0,0 +1,23 @@ +--- +nscd::enable_db_passwd: true +nscd::enable_db_group: true +nscd::enable_db_hosts: true +nscd::enable_db_services: true +nscd::enable_db_netgroup: true +nscd::enable_db_audit_user: false +nscd::enable_db_auth_attr: false +nscd::enable_db_bootparams: false +nscd::enable_db_ethers: false +nscd::enable_db_exec_attr: false +nscd::enable_db_ipnodes: false +nscd::enable_db_netmasks: false +nscd::enable_db_networks: false +nscd::enable_db_printers: false +nscd::enable_db_prof_attr: false +nscd::enable_db_project: false +nscd::enable_db_protocols: false +nscd::enable_db_rpc: false +nscd::enable_db_tnrhdb: false +nscd::enable_db_tnrhtp: false +nscd::enable_db_user_attr: false +nscd::enable_opt_auto_propagate: true diff --git a/manifests/init.pp b/manifests/init.pp index a36708e..1e8880d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,6 +21,7 @@ # * EL 6 # * EL 7 # * EL 8 +# * EL 9 # * Solaris 10 # * Suse 10 # * Suse 11 diff --git a/metadata.json b/metadata.json index 77b5dd3..05b83a8 100644 --- a/metadata.json +++ b/metadata.json @@ -29,7 +29,8 @@ "5", "6", "7", - "8" + "8", + "9" ] }, { @@ -38,7 +39,8 @@ "5", "6", "7", - "8" + "8", + "9" ] }, { @@ -47,7 +49,8 @@ "5", "6", "7", - "8" + "8", + "9" ] }, { @@ -56,7 +59,8 @@ "5", "6", "7", - "8" + "8", + "9" ] }, { diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 2c58b84..01fd0fd 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -105,6 +105,18 @@ enable_db_hosts: true, }, ), + 'el9' => defaults.merge( + { + osfamily: 'RedHat', + operatingsystemmajrelease: '9', + server_user: 'nscd', + enable_db_services: true, + enable_db_netgroup: true, + enable_db_passwd: true, + enable_db_group: true, + enable_db_hosts: true, + }, + ), 'suse10' => defaults.merge( { osfamily: 'Suse', From 7156e38dcca66ba7ac9aea0e3ea076e48bab94a7 Mon Sep 17 00:00:00 2001 From: Phil Friderici Date: Tue, 27 Jun 2023 13:11:27 +0000 Subject: [PATCH 2/2] Add support for Ubuntu 14-22.04 --- REFERENCE.md | 5 ++++ manifests/init.pp | 5 ++++ metadata.json | 7 ++++- spec/classes/init_spec.rb | 55 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) diff --git a/REFERENCE.md b/REFERENCE.md index 3114bbb..228a4f2 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -36,6 +36,11 @@ This module has been tested to work on the following systems: * Suse 15 * OpenSuse 13.1 * Ubuntu 12.04 LTS + * Ubuntu 14.04 LTS + * Ubuntu 16.04 LTS + * Ubuntu 18.04 LTS + * Ubuntu 20.04 LTS + * Ubuntu 22.04 LTS Compatibility with Dell Authentication Services ----------------------------------------------- diff --git a/manifests/init.pp b/manifests/init.pp index 1e8880d..79fb301 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -29,6 +29,11 @@ # * Suse 15 # * OpenSuse 13.1 # * Ubuntu 12.04 LTS +# * Ubuntu 14.04 LTS +# * Ubuntu 16.04 LTS +# * Ubuntu 18.04 LTS +# * Ubuntu 20.04 LTS +# * Ubuntu 22.04 LTS # # Compatibility with Dell Authentication Services # ----------------------------------------------- diff --git a/metadata.json b/metadata.json index 05b83a8..ecfecc4 100644 --- a/metadata.json +++ b/metadata.json @@ -96,7 +96,12 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "12.04" + "12.04", + "14.04", + "16.04", + "18.04", + "20.04", + "22.04" ] } ], diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 01fd0fd..b58e3aa 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -174,6 +174,61 @@ enable_opt_auto_propagate: true, }, ), + 'ubuntu14' => defaults.merge( + { + osfamily: 'Debian', + operatingsystemmajrelease: '14', + server_user: nil, + service_provider: nil, + enable_db_services: true, + enable_db_netgroup: false, + enable_opt_auto_propagate: true, + }, + ), + 'ubuntu16' => defaults.merge( + { + osfamily: 'Debian', + operatingsystemmajrelease: '16', + server_user: nil, + service_provider: nil, + enable_db_services: true, + enable_db_netgroup: false, + enable_opt_auto_propagate: true, + }, + ), + 'ubuntu18' => defaults.merge( + { + osfamily: 'Debian', + operatingsystemmajrelease: '18', + server_user: nil, + service_provider: nil, + enable_db_services: true, + enable_db_netgroup: false, + enable_opt_auto_propagate: true, + }, + ), + 'ubuntu20' => defaults.merge( + { + osfamily: 'Debian', + operatingsystemmajrelease: '20', + server_user: nil, + service_provider: nil, + enable_db_services: true, + enable_db_netgroup: false, + enable_opt_auto_propagate: true, + }, + ), + 'ubuntu22' => defaults.merge( + { + osfamily: 'Debian', + operatingsystemmajrelease: '22', + server_user: nil, + service_provider: nil, + enable_db_services: true, + enable_db_netgroup: false, + enable_opt_auto_propagate: true, + }, + ), 'solaris10' => defaults.merge( { kernel: 'SunOS',