Merge pull request #4 from Phil-Friderici/enhancements

Phil-Friderici · web-flow · commit 289b26332c9e · 2023-11-06T14:12:45.000+01:00
Enhancements
diff --git a/data/os/AlmaLinux.yaml b/data/os/AlmaLinux.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/Amazon.yaml b/data/os/Amazon.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/Archlinux.yaml b/data/os/Archlinux.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::ethers:
   - 'files'
 nsswitch::group:
diff --git a/data/os/CentOS.yaml b/data/os/CentOS.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/CloudLinux.yaml b/data/os/CloudLinux.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::ethers:
   - 'db'
   - 'files'
diff --git a/data/os/Fedora.yaml b/data/os/Fedora.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/Gentoo.yaml b/data/os/Gentoo.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
 nsswitch::automount:
diff --git a/data/os/LinuxMint.yaml b/data/os/LinuxMint.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::ethers:
   - 'db'
   - 'files'
diff --git a/data/os/OracleLinux.yaml b/data/os/OracleLinux.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/Rocky.yaml b/data/os/Rocky.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/SLES.yaml b/data/os/SLES.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
 nsswitch::automount:
diff --git a/data/os/Scientific.yaml b/data/os/Scientific.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/Solaris.yaml b/data/os/Solaris.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::aliases:
   - 'files'
   - 'nisplus'
diff --git a/data/os/Ubuntu.yaml b/data/os/Ubuntu.yaml
@@ -1,5 +1,4 @@
 ---
-nsswitch::file_group: 'root'
 nsswitch::ethers:
   - 'db'
   - 'files'
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -83,28 +83,28 @@
 # @param file_path
 #   The path to `nsswitch.conf` on the system.
 class nsswitch (
-  Optional[Variant[String, Array]] $aliases    = undef,
-  Optional[Variant[String, Array]] $automount  = undef,
-  Optional[Variant[String, Array]] $bootparams = undef,
-  Optional[Variant[String, Array]] $ethers     = undef,
-  Optional[Variant[String]]        $file_group = undef,
-  Variant[String]                  $file_owner = 'root',
-  Variant[String]                  $file_perms = '0644',
-  Optional[Variant[String, Array]] $group      = undef,
-  Optional[Variant[String, Array]] $hosts      = undef,
-  Optional[Variant[String, Array]] $netgroup   = undef,
-  Optional[Variant[String, Array]] $netmasks   = undef,
-  Optional[Variant[String, Array]] $networks   = undef,
-  Optional[Variant[String, Array]] $passwd     = undef,
-  Optional[Variant[String, Array]] $protocols  = undef,
-  Optional[Variant[String, Array]] $publickey  = undef,
-  Optional[Variant[String, Array]] $rpc        = undef,
-  Optional[Variant[String, Array]] $services   = undef,
-  Optional[Variant[String, Array]] $shadow     = undef,
-  Optional[Variant[String, Array]] $shells     = undef,
-  Optional[Variant[String, Array]] $gshadow    = undef,
-  Optional[Variant[String, Array]] $sudoers    = undef,
-  Stdlib::Unixpath                 $file_path  = '/etc/nsswitch.conf'
+  Stdlib::Unixpath       $file_path  = '/etc/nsswitch.conf',
+  String[1]              $file_owner = 'root',
+  String[1]              $file_group = 'root',
+  Stdlib::Filemode       $file_perms = '0644',
+  Variant[String, Array] $aliases    = [],
+  Variant[String, Array] $automount  = [],
+  Variant[String, Array] $bootparams = [],
+  Variant[String, Array] $ethers     = [],
+  Variant[String, Array] $group      = [],
+  Variant[String, Array] $hosts      = [],
+  Variant[String, Array] $netgroup   = [],
+  Variant[String, Array] $netmasks   = [],
+  Variant[String, Array] $networks   = [],
+  Variant[String, Array] $passwd     = [],
+  Variant[String, Array] $protocols  = [],
+  Variant[String, Array] $publickey  = [],
+  Variant[String, Array] $rpc        = [],
+  Variant[String, Array] $services   = [],
+  Variant[String, Array] $shadow     = [],
+  Variant[String, Array] $shells     = [],
+  Variant[String, Array] $gshadow    = [],
+  Variant[String, Array] $sudoers    = [],
 ) {
   case $facts['os']['name'] {
     /AlmaLinux|CentOS|RedHat|Rocky|Amazon|OEL|OracleLinux|Scientific|CloudLinux|Fedora|
diff --git a/spec/fixtures/testing/freebsd.txt b/spec/fixtures/testing/freebsd.txt
@@ -7,4 +7,4 @@ networks:   files
 protocols:  files
 rpc:        files
 services:   compat
-shells:    files
+shells:     files
diff --git a/templates/nsswitch.conf.epp b/templates/nsswitch.conf.epp
@@ -1,56 +1,56 @@
 # This file is controlled by Puppet
 
-<% if $::nsswitch::passwd { -%>
+<% if !$::nsswitch::passwd.empty() { -%>
 passwd:     <%= [*$::nsswitch::passwd].join(" ") %>
 <% } -%>
-<% if $::nsswitch::shadow { -%>
+<% if !$::nsswitch::shadow.empty() { -%>
 shadow:     <%= [*$::nsswitch::shadow].join(" ") %>
 <% } -%>
-<% if $::nsswitch::gshadow { -%>
+<% if !$::nsswitch::gshadow.empty() { -%>
 gshadow:    <%= [*$::nsswitch::gshadow].join(" ") %>
 <% } -%>
-<% if $::nsswitch::group { -%>
+<% if !$::nsswitch::group.empty() { -%>
 group:      <%= [*$::nsswitch::group].join(" ") %>
 <% } -%>
-<% if $::nsswitch::sudoers { -%>
+<% if !$::nsswitch::sudoers.empty() { -%>
 sudoers:    <%= [*$::nsswitch::sudoers].join(" ") %>
 <% } -%>
-<% if $::nsswitch::hosts { -%>
+<% if !$::nsswitch::hosts.empty() { -%>
 hosts:      <%= [*$::nsswitch::hosts].join(" ") %>
 <% } -%>
-<% if $::nsswitch::bootparams { -%>
+<% if !$::nsswitch::bootparams.empty() { -%>
 bootparams: <%= [*$::nsswitch::bootparams].join(" ") %>
 <% } -%>
-<% if $::nsswitch::ethers { -%>
+<% if !$::nsswitch::ethers.empty() { -%>
 ethers:     <%= [*$::nsswitch::ethers].join(" ") %>
 <% } -%>
-<% if $::nsswitch::netmasks { -%>
+<% if !$::nsswitch::netmasks.empty() { -%>
 netmasks:   <%= [*$::nsswitch::netmasks].join(" ") %>
 <% } -%>
-<% if $::nsswitch::networks { -%>
+<% if !$::nsswitch::networks.empty() { -%>
 networks:   <%= [*$::nsswitch::networks].join(" ") %>
 <% } -%>
-<% if $::nsswitch::protocols { -%>
+<% if !$::nsswitch::protocols.empty() { -%>
 protocols:  <%= [*$::nsswitch::protocols].join(" ") %>
 <% } -%>
-<% if $::nsswitch::rpc { -%>
+<% if !$::nsswitch::rpc.empty() { -%>
 rpc:        <%= [*$::nsswitch::rpc].join(" ") %>
 <% } -%>
-<% if $::nsswitch::services { -%>
+<% if !$::nsswitch::services.empty() { -%>
 services:   <%= [*$::nsswitch::services].join(" ") %>
 <% } -%>
-<% if $::nsswitch::netgroup { -%>
+<% if !$::nsswitch::netgroup.empty() { -%>
 netgroup:   <%= [*$::nsswitch::netgroup].join(" ") %>
 <% } -%>
-<% if $::nsswitch::publickey { -%>
+<% if !$::nsswitch::publickey.empty() { -%>
 publickey:  <%= [*$::nsswitch::publickey].join(" ") %>
 <% } -%>
-<% if $::nsswitch::automount { -%>
+<% if !$::nsswitch::automount.empty() { -%>
 automount:  <%= [*$::nsswitch::automount].join(" ") %>
 <% } -%>
-<% if $::nsswitch::aliases { -%>
+<% if !$::nsswitch::aliases.empty() { -%>
 aliases:    <%= [*$::nsswitch::aliases].join(" ") %>
 <% } -%>
-<% if $::nsswitch::shells { -%>
-shells:    <%= [*$::nsswitch::shells].join(" ") %>
+<% if !$::nsswitch::shells.empty() { -%>
+shells:     <%= [*$::nsswitch::shells].join(" ") %>
 <% } -%>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`---`
`2`		`-nsswitch::file_group: 'root'`
`3`	`2`	`nsswitch::aliases:`
`4`	`3`	`- 'files'`
`5`	`4`	`- 'nisplus'`