Add AlmaLinux 8 support (#111)

Additionally:
* Update module dependencies
* Add Puppet 8 support
* Drop Puppet 6 support

Fixes #110

CHANGELOG

@@ -1,3 +1,9 @@
+* Thu Sep 28 2023 Steven Pritchard <[email protected]> - 6.9.0
+- Add AlmaLinux 8 support
+- Update module dependencies
+- Add Puppet 8 support
+- Drop Puppet 6 support
+
 * Mon Jul 24 2023 Chris Tessmer <[email protected]> - 6.8.0
 - Add RockyLinux 8 support
 

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "simp-stunnel",
-  "version": "6.8.0",
+  "version": "6.9.0",
   "author": "SIMP Team",
   "summary": "manages stunnel with PKI support",
   "license": "Apache-2.0",
@@ -18,11 +18,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 6.4.0 < 8.0.0"
+      "version_requirement": ">= 6.4.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 8.0.0 < 9.0.0"
+      "version_requirement": ">= 8.0.0 < 10.0.0"
     },
     {
       "name": "simp/haveged",
@@ -72,12 +72,18 @@
       "operatingsystemrelease": [
         "8"
       ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8"
+      ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 6.22.1 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ]
 }

spec/spec_helper.rb

@@ -179,7 +179,7 @@ def set_environment(environment = :production)
     end
 
     hiera_version ||= 5
-    data = YAML.load(ERB.new(hiera_config_template(hiera_version.to_i), nil, '-').result(binding))
+    data = YAML.load(ERB.new(hiera_config_template(hiera_version.to_i), trim_mode: '-').result(binding))
 
     File.open(c.hiera_config, 'w') do |f|
       f.write data.to_yaml

templates/connection_conf.erb

@@ -44,7 +44,7 @@ if has_variable?('setgid')
     end
   end
 
-  if ['RedHat','CentOS','OracleLinux','Rocky'].include?(@facts['os']['name'])
+  if @facts['os']['family'] == 'RedHat'
     stunnel_conf << "fips = #{bool_translate[(@facts['fips_enabled'] || @fips)]}"
   end
 
@@ -150,7 +150,7 @@ else
     stunnel_conf << "retry = #{bool_translate[@retry]}"
   end
 
-  if ['RedHat','CentOS','OracleLinux','Rocky'].include?(@facts['os']['name'])
+  if @facts['os']['family'] == 'RedHat'
     stunnel_conf << "renegotiation = #{bool_translate[@renegotiation]}"
     stunnel_conf << "reset = #{bool_translate[@reset]}"
 

templates/instance_conf.erb

@@ -41,7 +41,7 @@
     end
   end
 
-  if ['RedHat','CentOS','OracleLinux','Rocky'].include?(@facts['os']['name'])
+  if @facts['os']['family'] == 'RedHat'
     stunnel_conf << "fips = #{bool_translate[(@facts['fips_enabled'] || @fips)]}"
   end
 
@@ -147,7 +147,7 @@
   end
 
 
-  if ['RedHat','CentOS','OracleLinux','Rocky'].include?(@facts['os']['name'])
+  if @facts['os']['family'] == 'RedHat'
     stunnel_conf << "renegotiation = #{bool_translate[@renegotiation]}"
     stunnel_conf << "reset = #{bool_translate[@reset]}"