Merge pull request #119 from web-servers/ModCluster_RHEL9

added default modcluster.conf update to manage new naming convention

Author: mmadzin

core/src/main/groovy/noe/common/DefaultProperties.groovy

@@ -2,6 +2,7 @@ package noe.common
 
 import noe.common.utils.Library
 import noe.common.utils.OpenSslVersion
+import noe.common.utils.Platform
 import noe.common.utils.Version
 /**
  *
@@ -127,4 +128,8 @@ class DefaultProperties {
   public static final String MODCLUSTER_MCAST_PORT = Library.getUniversalProperty('modcluster.mcast.port', '23364')
   public static final String UDP_MCAST_ADDRESS = Library.getUniversalProperty('udp.mcast.address', Library.getUniversalProperty("MCAST_ADDR", '228.11.11.11'))
   public static final String JGROUPS_MCAST_PORT = Library.getUniversalProperty('jgroups.mcast.port', Library.getUniversalProperty("MCAST_PORT", '45688'))
+
+  // Added to allow for the new naming convention used in RHEL9
+  static final String MOD_CLUSTER_CONFIG_FILE = new Platform().isRHEL9() ? Library.getUniversalProperty('mod.proxy.cluster.config.file', "mod_proxy_cluster.conf") : Library.getUniversalProperty('modcluster.config.file', "mod_cluster.conf")
+  static final String MOD_PROXY_CLUSTER_CONFIG_FILE = MOD_CLUSTER_CONFIG_FILE
 }

core/src/main/groovy/noe/rhel/server/workspace/WorkspaceHttpdTomcatsBaseOS.groovy

@@ -95,7 +95,7 @@ class WorkspaceHttpdTomcatsBaseOS extends WorkspaceMultipleTomcats{
    * @param httpd Instance of `Httpd` server
    */
   private void copyModClusterConfIfMissing(Httpd httpd) {
-    List<String> confRelativePaths = ["conf.d/mod_cluster.conf"]
+    List<String> confRelativePaths = ["conf.d/${DefaultProperties.MOD_CLUSTER_CONFIG_FILE}"]
     confRelativePaths.each() { String confRelativePath->
       File confPath = new File(httpd.getServerRoot(), confRelativePath)
       File sclConfPath = new File("${DefaultProperties.HTTPD_SCL_ROOT}/etc/httpd/${confRelativePath}")

testsuite/src/test/groovy/noe/HttpdKillTestIT.groovy

@@ -1,6 +1,7 @@
 package noe
 
 import groovy.util.logging.Slf4j
+import noe.common.DefaultProperties
 import noe.common.TestAbstract
 import noe.common.utils.JBFile
 import noe.common.utils.Platform
@@ -35,8 +36,8 @@ class HttpdKillTestIT extends TestAbstract {
       log.debug("Deleting ssl.conf: $sslConfFile.absolutePath")
       JBFile.delete(sslConfFile)
       // we are not testing mod_cluster here, lets remove mod_cluster
-      def mod_clusterConfFile = new File(httpdServer.getConfDeploymentPath(), "mod_cluster.conf")
-      log.debug("Deleting mod-cluster.conf: $mod_clusterConfFile.absolutePath")
+      def mod_clusterConfFile = new File(httpdServer.getConfDeploymentPath(), DefaultProperties.MOD_CLUSTER_CONFIG_FILE)
+      log.debug("Deleting ${DefaultProperties.MOD_CLUSTER_CONFIG_FILE}: $mod_clusterConfFile.absolutePath")
       JBFile.delete(mod_clusterConfFile)
     }
   }