diff --git a/MODCLUSTER-528-CatalinaContext.java.patch b/MODCLUSTER-528-CatalinaContext.java.patch deleted file mode 100644 index dcd3c00..0000000 --- a/MODCLUSTER-528-CatalinaContext.java.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git container/catalina/src/main/java/org/jboss/modcluster/container/catalina/CatalinaContext.java container/catalina/src/main/java/org/jboss/modcluster/container/catalina/CatalinaContext.java -index 412d8cc..36f8f28 100644 ---- container/catalina/src/main/java/org/jboss/modcluster/container/catalina/CatalinaContext.java -+++ container/catalina/src/main/java/org/jboss/modcluster/container/catalina/CatalinaContext.java -@@ -30,6 +30,7 @@ import javax.servlet.http.HttpSessionListener; - - import org.apache.catalina.Pipeline; - import org.apache.catalina.Valve; -+import org.apache.catalina.LifecycleState; - import org.jboss.modcluster.container.Context; - import org.jboss.modcluster.container.Host; - -@@ -67,7 +68,7 @@ public class CatalinaContext implements Context { - - @Override - public boolean isStarted() { -- return this.context.getAvailable(); -+ return LifecycleState.STARTED.equals(this.context.getState()); - } - - @Override diff --git a/README.fedora b/README.fedora index f67e607..925fd94 100644 --- a/README.fedora +++ b/README.fedora @@ -3,7 +3,7 @@ Detailed information about configuring mod_cluster can be found here: - http://modcluster.io/documentation/#httpd-configuration + https://docs.modcluster.io/#httpd with some additional FAQ on: diff --git a/mod_cluster.conf b/mod_cluster.conf index e96d169..8ae9485 100644 --- a/mod_cluster.conf +++ b/mod_cluster.conf @@ -23,12 +23,18 @@ # # semanage port -a -t http_port_t -p tcp 6666 # + # For UDP datagrams with httpd's location to be sent to UDP Multicast address, one might have + # to allow it: + # + # semanage port -a -t http_port_t -p udp 23364 + # # also Firewalld might need to know about it (depends on your network # domains and particular setup), example: # # firewall-cmd --add-port=6666/tcp # firewall-cmd --add-port=6666/tcp --permanent # + # Listen 6666 diff --git a/mod_cluster.spec b/mod_cluster.spec deleted file mode 100644 index 0bd594e..0000000 --- a/mod_cluster.spec +++ /dev/null @@ -1,325 +0,0 @@ -%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} -%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} -%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} -# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 -%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} - -%global namedreltag .Final -%global namedversion %{version}%{?namedreltag} - -%if 0%{?fedora} -%bcond_with java -%endif - -Name: mod_cluster -Version: 1.3.3 -Release: 14%{?dist} -Summary: Apache HTTP Server dynamic load balancer with Wildfly and Tomcat libraries -License: LGPLv3 -URL: http://modcluster.io/ -Source0: https://github.com/modcluster/mod_cluster/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz -Source1: mod_cluster.conf -Source2: README.fedora - -Patch0: MODCLUSTER-528-CatalinaContext.java.patch - -Requires: httpd >= 2.2.26 -Requires: httpd-mmn = %{_httpd_mmn} - -BuildRequires: httpd-devel >= 2.2.26 -BuildRequires: autoconf -BuildRequires: make -BuildRequires: gcc - -%if %{without java} -BuildRequires: maven-local -BuildRequires: mvn(net.jcip:jcip-annotations) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) -BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) -BuildRequires: mvn(org.apache.tomcat:tomcat-coyote) -BuildRequires: mvn(org.apache.tomcat:tomcat-util) -BuildRequires: mvn(org.jboss:jboss-parent:pom:) -BuildRequires: mvn(org.jboss.logging:jboss-logging) -BuildRequires: mvn(org.jboss.logging:jboss-logging-processor) -BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec) -%endif - -%description -Mod_cluster is an httpd-based load balancer. Like mod_jk and mod_proxy, -mod_cluster uses a communication channel to forward requests from httpd to one -of a set of application server nodes. Unlike mod_jk and mod_proxy, mod_cluster -leverages an additional connection between the application server nodes and -httpd. The application server nodes use this connection to transmit server-side -load balance factors and lifecycle events back to httpd via a custom set of -HTTP methods, affectionately called the Mod-Cluster Management Protocol (MCMP). -This additional feedback channel allows mod_cluster to offer a level of -intelligence and granularity not found in other load balancing solutions. - -%if %{without java} -%package java -Summary: Java libraries for %{name} -BuildArch: noarch - -%description java -This package contains %{name} core Java libraries -that can be used with WildFly application server. - -%package java-tomcat8 -Summary: Tomcat 8 Java libraries for %{name} -Requires: tomcat >= 1:8 -BuildArch: noarch - -%description java-tomcat8 -This package contains %{name} Java libraries that can be used with Tomcat 8. - -%package javadoc -Summary: Javadoc for %{name} -BuildArch: noarch - -%description javadoc -This package contains the API documentation for %{name}. - -%package container -Summary: Mod_cluster Container Parent POM -BuildArch: noarch - -%description container -Mod_cluster Container Parent POM. - -%package parent -Summary: Mod_cluster Parent POM. -BuildArch: noarch - -%description parent -Mod_cluster Parent POM. - -%endif - -%prep -%setup -q -n %{name}-%{namedversion} -%patch0 -p0 - -%if %{without java} -%pom_disable_module demo -%pom_disable_module tomcat6 container -%pom_disable_module tomcat7 container -%pom_disable_module jbossweb container - -%pom_remove_plugin :animal-sniffer-maven-plugin -%pom_remove_plugin :versions-maven-plugin - -%pom_change_dep :jboss-servlet-api_3.0_spec org.apache.tomcat:tomcat-util container/catalina - -%pom_change_dep org.apache.tomcat: ::'${version.tomcat8}' container/catalina - -%pom_change_dep :catalina :tomcat-catalina:'${version.tomcat8}' container/catalina-standalone -%pom_change_dep :coyote :tomcat-coyote:'${version.tomcat8}' container/catalina-standalone - -%pom_xpath_remove "pom:dependency[pom:type = 'test-jar']" container/tomcat8 -%pom_xpath_inject "pom:profile[pom:id = 'TC8']/pom:modules" "catalina-standalone" container - -%pom_xpath_set "pom:profile[pom:id = 'TC7']/pom:id" TC8 container/catalina - -# Wildfly/core lib -%mvn_package ":mod_cluster-core" java -%mvn_package ":mod_cluster-container-spi" java - -%mvn_file :mod_cluster-core:jar: mod_cluster/mod_cluster-core tomcat/mod_cluster-core -%mvn_file :mod_cluster-container-spi:jar: mod_cluster/mod_cluster-container-spi tomcat/mod_cluster-container-spi - -# Tomcat-ish -%mvn_package ":mod_cluster-container-tomcat8" java-tomcat8 -%mvn_package ":mod_cluster-container-catalina-standalone" java-tomcat8 -%mvn_package ":mod_cluster-container-catalina" java-tomcat8 - -%mvn_file :mod_cluster-container-catalina:jar: tomcat/mod_cluster-container-catalina -%mvn_file :mod_cluster-container-catalina-standalone:jar: tomcat/mod_cluster-container-catalina-standalone -%mvn_file :mod_cluster-container-tomcat8:jar: tomcat/mod_cluster-container-tomcat8 - -# Disable useless artifacts generation, package __noinstall do not work -%pom_add_plugin org.apache.maven.plugins:maven-source-plugin . ' - - true -' - -%endif - -%build - -CFLAGS="$RPM_OPT_FLAGS" -export CFLAGS - -module_dirs=( advertise mod_manager mod_proxy_cluster mod_cluster_slotmem ) - -for dir in ${module_dirs[@]} ; do - pushd native/${dir} - sh buildconf - %configure --libdir=%{_libdir} --with-apxs=%{_httpd_apxs} - make %{?_smp_mflags} - popd -done - -%if %{without java} -%mvn_build -s -f -- -PTC8 -%endif - -%install -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/httpd/modules -install -d -m 755 $RPM_BUILD_ROOT%{_httpd_confdir} - -module_dirs=( advertise mod_manager mod_proxy_cluster mod_cluster_slotmem ) -for dir in ${module_dirs[@]} ; do - pushd native/${dir} - cp ./*.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules - popd -done - -%if %{without java} -%mvn_install - -ln -sf %{_javadir}/jboss-logging/jboss-logging.jar \ - $RPM_BUILD_ROOT%{_javadir}/tomcat/jboss-logging.jar - -%endif - -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/ - -install -pm 0644 %{SOURCE2} README - -%files -%doc README -%license lgpl.txt -%{_libdir}/httpd/modules/mod_advertise.so -%{_libdir}/httpd/modules/mod_manager.so -%{_libdir}/httpd/modules/mod_proxy_cluster.so -%{_libdir}/httpd/modules/mod_cluster_slotmem.so -%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf - -%if %{without java} -%files java -f .mfiles-java -%license lgpl.txt - -%files java-tomcat8 -f .mfiles-java-tomcat8 -%{_javadir}/tomcat/jboss-logging.jar - -%files javadoc -f .mfiles-javadoc -%license lgpl.txt - -%files container -f .mfiles-mod_cluster-container -%license lgpl.txt - -%files parent -f .mfiles-mod_cluster-parent -%license lgpl.txt -%endif - -%changelog -* Fri Feb 01 2019 Fedora Release Engineering - 1.3.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.3.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 1.3.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.3.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.3.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.3.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Sep 06 2016 Michal Karm Babacek 1.3.3-8 -- mod_cluster.conf and README file updates about Firewalld and Selinux - -* Mon Sep 05 2016 Michal Karm Babacek 1.3.3-7 -- adjusted release number, build for f25 - -* Mon Aug 30 2016 gil cattaneo 1.3.3-5 -- remove useless pom macros -- add subpackages for parent POMs -- use custom _httpd_confdir macro - -* Mon Aug 29 2016 gil cattaneo 1.3.3-4 -- fix BR list -- marked as noarch only the java stuff - -* Mon Aug 29 2016 Michal Karm Babacek 1.3.3-3 -- Added mvn(..) BuildRequires for Tomcat libs instead of direct dependency on tomcat package - -* Mon Aug 29 2016 gil cattaneo 1.3.3-2 -- fix pom macros - -* Mon Aug 29 2016 Michal Karm Babacek - 1.3.3-1 -- Upstream release 1.3.3.Final -- Refactored spec file - -* Thu Feb 04 2016 Fedora Release Engineering - 1.2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 1.2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jan 23 2014 Joe Orton - 1.2.6-3 -- fix _httpd_mmn expansion in absence of httpd-devel - -* Fri Jan 17 2014 Marek Goldmann - 1.2.6-2 -- Add support for conditional build that builds only HTTPD module - -* Wed Sep 25 2013 Marek Goldmann - 1.2.6-1 -- Upstream release 1.2.6.Final -- Support for Apache 2.4 in mod_cluster.conf - -* Mon Aug 05 2013 Marek Goldmann - 1.2.4-1 -- Upstream release 1.2.4.Final - -* Sat Aug 03 2013 Fedora Release Engineering - 1.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.2.1-4 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Fri Jul 20 2012 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 05 2012 Marek Goldmann - 1.2.1-2 -- Added missing container.pom - -* Mon May 07 2012 Marek Goldmann - 1.2.1-1 -- Upstream release 1.2.1.Final -- Port to httpd 2.4, RHBZ#813871 - -* Wed Mar 28 2012 Marek Goldmann - 1.2.0-1 -- Upstream release 1.2.0.Final -- Add java subpackage with AS7 required jars - -* Tue Mar 27 2012 Marek Goldmann - 1.1.1-4 -- Require httpd-mmn RHBZ#803068 - -* Fri Jan 13 2012 Fedora Release Engineering - 1.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Mar 11 2011 Marek Goldmann - 1.1.1-2 -- Another round of cleanup in spec file -- Patch that disables compilation-time warnings - -* Thu Mar 10 2011 Marek Goldmann - 1.1.1-1 -- Upstream release 1.1.1 -- Cleanup in spec file - -* Fri Nov 12 2010 Marek Goldmann - 1.1.0-1 -- Initial release -