[jbossnative-commits] JBoss Native SVN: r2727 - in trunk: httpd/httpd-2.2/installer and 1 other directory.
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-21 05:51:16 -0500 (Fri, 21 Jan 2011)
New Revision: 2727
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
trunk/httpd/httpd-2.2/installer/installconf.bat
Log:
Arrange mod_cluster logic on windows.
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-20 17:11:56 UTC (rev 2726)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-21 10:51:16 UTC (rev 2727)
@@ -87,24 +87,35 @@
;;
1.1.*)
cat >> "${win_output_loc}/conf/default/httpd.conf.in" <<EOF
+
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+
+LoadModule proxy_cluster_module modules/mod_proxy_cluster.so
+
+LoadModule manager_module modules/mod_manager.so
+LoadModule slotmem_module modules/mod_slotmem.so
+LoadModule advertise_module modules/mod_advertise.so
+
# MOD_CLUSTER_ADDS
# Adjust to you hostname and subnet.
<IfModule manager_module>
- Listen 127.0.0.1:6666
+ Listen @@MCMPIP@@:@@MCMPPORT@@
ManagerBalancerName mycluster
- <VirtualHost 127.0.0.1:6666>
+ <VirtualHost @@MCMPIP@@:@@MCMPPORT@@>
<Directory />
Order deny,allow
Deny from all
- Allow from 127.0.0
+ Allow from @@SUBIP@@
</Directory>
KeepAliveTimeout 300
MaxKeepAliveRequests 0
- #ServerAdvertise on http://@IP@:6666
+ #ServerAdvertise on http://@@MCMPIP@@:@@MCMPPORT@@
AdvertiseFrequency 5
#AdvertiseSecurityKey secret
- #AdvertiseGroup @ADVIP@:23364
+ #AdvertiseGroup @@ADVIP@@:23364
<Location /mod_cluster_manager>
SetHandler mod_cluster-manager
Modified: trunk/httpd/httpd-2.2/installer/installconf.bat
===================================================================
--- trunk/httpd/httpd-2.2/installer/installconf.bat 2011-01-20 17:11:56 UTC (rev 2726)
+++ trunk/httpd/httpd-2.2/installer/installconf.bat 2011-01-21 10:51:16 UTC (rev 2727)
@@ -54,7 +54,11 @@
set HTTPD_ADMIN=%USERNAME%(a)%HTTPD_SERVERNAME%.%HTTPD_DOMAINNAME%
set HTTPD_ROOT=%INSTALL_HOME%
+set MCMPADVIP=224.0.1.105
+set MCMPADPORT=23364
+set MCMPSUBIP=127.0.0.1
+set MCMPPORT=6666
-nawk.exe -f installconf.awk -v WINDOWS=1 %HTTPD_DOMAINNAME% %HTTPD_SERVERNAME%
%HTTPD_ADMIN% %HTTPD_PORT% %HTTPD_SSLPORT% "%HTTPD_ROOT%"
+nawk.exe -f installconf.awk -v WINDOWS=1 %HTTPD_DOMAINNAME% %HTTPD_SERVERNAME%
%HTTPD_ADMIN% %HTTPD_PORT% %HTTPD_SSLPORT% "%HTTPD_ROOT%" %MCMPADVIP%
%MCMPADPORT% %MCMPSUBIP% %MCMPPORT%
if "x%NOPAUSE%" == "x" pause
:cmdEnd