Add RockyLinux 8 support (#24)

Author: rgardner4012

.github/workflows/pr_tests.yml

@@ -109,14 +109,16 @@ jobs:
     strategy:
       matrix:
         puppet:
-          - label: 'Puppet 7.x'
-            puppet_version: '~> 7.21.0'
+          - label: 'Puppet 7.x [SIMP 6.6/PE 2021.7]'
+            puppet_version: '~> 7.0'
             ruby_version: '2.7'
+            experimental: false
           - label: 'Puppet 8.x'
             puppet_version: '~> 8.0'
-            ruby_version: '3.2'
+            ruby_version: 3.1
+            experimental: true
     env:
-      PUPPET_VERSION: '${{matrix.puppet.puppet_version}}'
+      PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
     steps:
       - uses: actions/checkout@v3
       - name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
@@ -126,6 +128,7 @@ jobs:
           bundler-cache: true
       - run: 'command -v rpm || if command -v apt-get; then sudo apt-get update; sudo apt-get install -y rpm; fi ||:'
       - run: 'bundle exec rake spec'
+        continue-on-error: ${{matrix.puppet.experimental}}
 
 #  dump_contexts:
 #    name: 'Examine Context contents'

.puppet-lint.rc

@@ -9,7 +9,7 @@
 --no-class_inherits_from_params_class-check
 --no-140chars-check
 --no-trailing_comma-check
---no-empty_string_assignment-check
+--no-params-empty-string-assignment-check
 # This is here because the code can't handle lookups in parameters and SIMP
 # modules have a LOT of those
 --no-parameter_order-check

CHANGELOG

@@ -1,3 +1,6 @@
+* Mon Jun 12 2023 Chris Tessmer <chris.tessmer@onyxpoint.com> - 0.3.0
+- Add RockyLinux 8 support
+
 * Fri Jun 03 2022 Chris Tessmer <chris.tessmer@onyxpoint.com> - 0.2.0
 - Update from camptocamp/systemd to puppet/systemd
 

Gemfile

@@ -21,7 +21,6 @@ group :test do
   gem 'puppetlabs_spec_helper'
   gem 'metadata-json-lint'
   gem 'puppet-strings'
-  gem 'puppet-lint-empty_string-check',   :require => false
   gem 'puppet-lint-trailing_comma-check', :require => false
   gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1'
   gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.12.1', '< 6']

data/os/Rocky-8.yaml

@@ -0,0 +1,6 @@
+---
+ds389::install::package_list:
+  - 389-ds-base
+ds389::install::dnf_module: 389-directory-server
+ds389::install::dnf_stream: stable
+ds389::install::dnf_profile: minimal

manifests/init.pp

@@ -40,7 +40,7 @@
     recurse => true
   }
 
-  file { "$config_dir/ca_import.sh":
+  file { "${config_dir}/ca_import.sh":
     ensure  => 'file',
     owner   => 'root',
     group   => 'root',

manifests/instance.pp

@@ -75,7 +75,7 @@
   Simplib::Port                  $port                   = 389,
   Simplib::Port                  $secure_port            = 636,
   Optional[Pattern['^[\S]+$']]   $root_dn_password       = undef,
-  String[1]                      $machine_name           = $facts['fqdn'],
+  String[1]                      $machine_name           = $facts['networking']['fqdn'],
   String[1]                      $service_user           = 'dirsrv',
   String[1]                      $service_group          = 'dirsrv',
   Optional[String[1]]            $bootstrap_ldif_content = undef,

manifests/instance/selinux/port.pp

@@ -11,7 +11,7 @@
 
   $_port = Integer($title)
 
-  if ($_port != $default) and $facts['selinux_enforced'] {
+  if ($_port != $default) and $facts['os']['selinux']['enforced'] {
     if simplib::module_exist('simp/selinux') {
       simplib::assert_optional_dependency($module_name, 'simp/selinux')
       simplib::assert_optional_dependency($module_name, 'simp/vox_selinux')

manifests/instance/tls.pp

@@ -56,8 +56,8 @@
   Variant[Boolean, Enum['disabled','simp']] $ensure        = simplib::lookup('simp_options::pki', { 'default_value' => false}),
   Simplib::Port                             $port          = 636,
   Optional[String[1]]                       $source        = simplib::lookup('simp_options::pki::source', { 'default_value' => '/etc/pki/simp/x509' }),
-  Stdlib::Absolutepath                      $cert          = "/etc/pki/simp_apps/${module_name}_${title}/x509/public/${facts['fqdn']}.pub",
-  Stdlib::Absolutepath                      $key           = "/etc/pki/simp_apps/${module_name}_${title}/x509/private/${facts['fqdn']}.pem",
+  Stdlib::Absolutepath                      $cert          = "/etc/pki/simp_apps/${module_name}_${title}/x509/public/${facts['networking']['fqdn']}.pub",
+  Stdlib::Absolutepath                      $key           = "/etc/pki/simp_apps/${module_name}_${title}/x509/private/${facts['networking']['fqdn']}.pem",
   Stdlib::Absolutepath                      $cafile        = "/etc/pki/simp_apps/${module_name}_${title}/x509/cacerts/cacerts.pem",
   Ds389::ConfigItems                        $dse_config    = simplib::dlookup('ds389::instance::tls', 'dse_config', { 'default_value' => {} }),
   String[16]                                $token         = simplib::passgen("ds389_${title}_pki", { 'length' => 32, 'complexity' => 1 }),

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "simp-ds389",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "author": "SIMP Team",
   "summary": "Management of 389 Directory Server",
   "license": "Apache-2.0",
@@ -10,15 +10,15 @@
   "dependencies": [
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 3.0.0 < 4.0.0"
+      "version_requirement": ">= 4.0.2 < 6.0.0"
     },
     {
       "name": "simp/simplib",
       "version_requirement": ">= 4.4.1 < 5.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 6.6.0 < 8.0.0"
+      "version_requirement": ">= 8.0.0 < 9.0.0"
     }
   ],
   "simp": {
@@ -59,6 +59,12 @@
       "operatingsystemrelease": [
         "8"
       ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8"
+      ]
     }
   ],
   "requirements": [