Adaptions for RHEL9, corrections

manifests/aes_sw.pp

@@ -8,7 +8,7 @@ class aes::aes_sw {
   $examadm_group = $examadm_user
   $examadm_home = "/home/${examadm_user}"
 
-  case fact('os.family') {
+  case fact('os.name') {
     'RedHat': {
       firewalld_custom_service { 'aes-server':
         description => 'Authentic Examination System server',
@@ -52,7 +52,7 @@ class aes::aes_sw {
       }
     }
     default: {
-      fail("${module_name} - Not supported for family ${fact('os.family')}.")
+      fail("${module_name} - Not supported for family ${fact('os.name')}.")
     }
   }
 

manifests/broker.pp

@@ -11,7 +11,7 @@ class aes::broker {
   $broker_home = "/srv/${broker_user}"
   $broker_service = 'aes_broker'
 
-  case fact('os.family') {
+  case fact('os.name') {
     'RedHat': {
       package {
         [
@@ -22,7 +22,7 @@ class aes::broker {
       }
 
       firewalld_custom_service { 'aes-broker':
-        description => 'Authentic Examination System server',
+        description => 'Authentic Examination System communication broker',
         ports       => [
           { port => '31337',  protocol => 'tcp' },
         ],
@@ -67,7 +67,7 @@ class aes::broker {
       }
     }
     default: {
-      fail("${module_name} - Not supported for family ${fact('os.family')}.")
+      fail("${module_name} - Not supported for family ${fact('os.name')}.")
     }
   }
 

manifests/init.pp

@@ -15,8 +15,9 @@ class aes {
   include aes::auth
   include aes::auth_keydb
 
-  case fact('os.family') {
+  case fact('os.name') {
     'RedHat': {
+      # TODO: liurepo::centos_sclo_rh ???
       # TODO: Move this to the subclass that actually require it?
       package {
         [
@@ -27,7 +28,6 @@ class aes {
           'python3',
         ]:
           ensure  => installed,
-          require => Class['liurepo::centos_sclo_rh'],
       }
     }
     'CentOS': {
@@ -46,7 +46,7 @@ class aes {
       }
     }
     default: {
-      fail("${module_name} - Not supported for family ${fact('os.family')}.")
+      fail("${module_name} - Not supported for family ${fact('os.name')}.")
     }
   }
 

manifests/squid_filter.pp

@@ -5,7 +5,7 @@
 #
 #
 class aes::squid_filter {
-  case fact('os.family') {
+  case fact('os.name') {
     'RedHat': {
       firewalld_custom_service { 'squid':
         description => 'Squid proxy for filtered internet access',
@@ -43,7 +43,7 @@ class aes::squid_filter {
       }
     }
     default: {
-      fail("${module_name} - Not supported for family ${fact('os.family')}.")
+      fail("${module_name} - Not supported for family ${fact('os.name')}.")
     }
   }