JBoss Native SVN: r2734 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-31 10:43:02 -0500 (Mon, 31 Jan 2011)
New Revision: 2734
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
Log:
Typo.
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-31 12:56:00 UTC (rev 2733)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-31 15:43:02 UTC (rev 2734)
@@ -127,7 +127,7 @@
</VirtualHost>
</IfModule>
EOF
- sed "s:8080:8000" "${win_output_loc}/bin/installconf.bat" > "${win_output_loc}/bin/installconf.$$"
+ sed "s:8080:8000:" "${win_output_loc}/bin/installconf.bat" > "${win_output_loc}/bin/installconf.$$"
mv "${win_output_loc}/bin/installconf.$$" "${win_output_loc}/bin/installconf.bat"
;;
esac
13 years, 10 months
JBoss Native SVN: r2733 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-31 07:56:00 -0500 (Mon, 31 Jan 2011)
New Revision: 2733
Modified:
trunk/build/unix/package.list
Log:
Release 1.1.1.Final
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2011-01-31 07:23:36 UTC (rev 2732)
+++ trunk/build/unix/package.list 2011-01-31 12:56:00 UTC (rev 2733)
@@ -51,5 +51,6 @@
mod_cluster|1.0.6.dev|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:branches/1.0.x
mod_cluster|1.0.6.GA|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.0.6.GA
mod_cluster|1.1.1.dev|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
+mod_cluster|1.1.1.Final|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.1.1.Final
traffic_server|TS_Trunk|trunk
TC7|TC7_Trunk|trunk
13 years, 10 months
JBoss Native SVN: r2732 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-31 02:23:36 -0500 (Mon, 31 Jan 2011)
New Revision: 2732
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
Log:
Change port to 8000
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-28 11:00:29 UTC (rev 2731)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-31 07:23:36 UTC (rev 2732)
@@ -127,6 +127,8 @@
</VirtualHost>
</IfModule>
EOF
+ sed "s:8080:8000" "${win_output_loc}/bin/installconf.bat" > "${win_output_loc}/bin/installconf.$$"
+ mv "${win_output_loc}/bin/installconf.$$" "${win_output_loc}/bin/installconf.bat"
;;
esac
13 years, 10 months
JBoss Native SVN: r2731 - trunk/httpd/httpd-2.2/installer.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-28 06:00:29 -0500 (Fri, 28 Jan 2011)
New Revision: 2731
Modified:
trunk/httpd/httpd-2.2/installer/installconf.awk
Log:
Oops 6666 should be used instead 23364
Modified: trunk/httpd/httpd-2.2/installer/installconf.awk
===================================================================
--- trunk/httpd/httpd-2.2/installer/installconf.awk 2011-01-24 10:04:27 UTC (rev 2730)
+++ trunk/httpd/httpd-2.2/installer/installconf.awk 2011-01-28 11:00:29 UTC (rev 2731)
@@ -179,7 +179,6 @@
gsub( /443/, serversslport );
gsub( /@@ADVIP@@/, mcmpadvip );
gsub( /23364/, mcmpadvport );
- gsub( /@@MCMPPORT@@/, mcmpadvport );
gsub( /@@SUBIP@@/, mcmpsubip );
gsub( /@@MCMPIP@@/, mcmpip );
gsub( /@@MCMPPORT@@/, mcmpport );
13 years, 10 months
JBoss Native SVN: r2730 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-24 05:04:27 -0500 (Mon, 24 Jan 2011)
New Revision: 2730
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
trunk/build/unix/buildbin.mod_cluster.windows.sh
Log:
Use Location Directory should be something like /home/jfclere/APACHE-2.2.17/htdocs/ ...
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2011-01-24 07:59:29 UTC (rev 2729)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2011-01-24 10:04:27 UTC (rev 2730)
@@ -237,11 +237,11 @@
Listen 127.0.0.1:6666
ManagerBalancerName mycluster
<VirtualHost 127.0.0.1:6666>
- <Directory />
+ <Location />
Order deny,allow
Deny from all
Allow from 127.0.0
- </Directory>
+ </Location>
KeepAliveTimeout 300
MaxKeepAliveRequests 0
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-24 07:59:29 UTC (rev 2729)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-24 10:04:27 UTC (rev 2730)
@@ -104,11 +104,11 @@
Listen @@MCMPIP@@:@@MCMPPORT@@
ManagerBalancerName mycluster
<VirtualHost @@MCMPIP@@:@@MCMPPORT@@>
- <Directory />
+ <Location />
Order deny,allow
Deny from all
Allow from @@SUBIP@@
- </Directory>
+ </Location>
KeepAliveTimeout 300
MaxKeepAliveRequests 0
13 years, 10 months
JBoss Native SVN: r2729 - trunk/httpd/httpd-2.2/installer.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-24 02:59:29 -0500 (Mon, 24 Jan 2011)
New Revision: 2729
Modified:
trunk/httpd/httpd-2.2/installer/installconf.awk
Log:
Typo and use @@MCMPPORT@@ (mod_cluster httpd.conf.in).
Modified: trunk/httpd/httpd-2.2/installer/installconf.awk
===================================================================
--- trunk/httpd/httpd-2.2/installer/installconf.awk 2011-01-21 16:25:06 UTC (rev 2728)
+++ trunk/httpd/httpd-2.2/installer/installconf.awk 2011-01-24 07:59:29 UTC (rev 2729)
@@ -19,7 +19,7 @@
serversslport = ARGV[5];
serverroot = ARGV[6];
mcmpadvip = ARGV[7];
- mcmpadport = ARGV[8];
+ mcmpadvport = ARGV[8];
mcmpsubip = ARGV[9];
mcmpip = ARGV[10];
mcmpport = ARGV[11];
@@ -179,6 +179,7 @@
gsub( /443/, serversslport );
gsub( /@@ADVIP@@/, mcmpadvip );
gsub( /23364/, mcmpadvport );
+ gsub( /@@MCMPPORT@@/, mcmpadvport );
gsub( /@@SUBIP@@/, mcmpsubip );
gsub( /@@MCMPIP@@/, mcmpip );
gsub( /@@MCMPPORT@@/, mcmpport );
13 years, 10 months
JBoss Native SVN: r2728 - trunk/httpd/httpd-2.2/installer.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-21 11:25:06 -0500 (Fri, 21 Jan 2011)
New Revision: 2728
Modified:
trunk/httpd/httpd-2.2/installer/installconf.bat
Log:
Oops missing the mcmpip.
Modified: trunk/httpd/httpd-2.2/installer/installconf.bat
===================================================================
--- trunk/httpd/httpd-2.2/installer/installconf.bat 2011-01-21 10:51:16 UTC (rev 2727)
+++ trunk/httpd/httpd-2.2/installer/installconf.bat 2011-01-21 16:25:06 UTC (rev 2728)
@@ -57,8 +57,9 @@
set MCMPADVIP=224.0.1.105
set MCMPADPORT=23364
set MCMPSUBIP=127.0.0.1
+set MCMPIP=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%" %MCMPADVIP% %MCMPADPORT% %MCMPSUBIP% %MCMPPORT%
+nawk.exe -f installconf.awk -v WINDOWS=1 %HTTPD_DOMAINNAME% %HTTPD_SERVERNAME% %HTTPD_ADMIN% %HTTPD_PORT% %HTTPD_SSLPORT% "%HTTPD_ROOT%" %MCMPADVIP% %MCMPADPORT% %MCMPSUBIP% %MCMPIP% %MCMPPORT%
if "x%NOPAUSE%" == "x" pause
:cmdEnd
13 years, 10 months
JBoss Native SVN: r2727 - in trunk: httpd/httpd-2.2/installer and 1 other directory.
by jbossnative-commits@lists.jboss.org
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
13 years, 10 months
JBoss Native SVN: r2726 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-20 12:11:56 -0500 (Thu, 20 Jan 2011)
New Revision: 2726
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
Log:
Add default configuration.
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-19 15:14:58 UTC (rev 2725)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2011-01-20 17:11:56 UTC (rev 2726)
@@ -81,5 +81,43 @@
cp target/*-bin.* ${build_top}/output
)
+# Add default mod_cluster conf in httpd.conf
+case $build_version in
+ 1.0.*)
+ ;;
+ 1.1.*)
+ cat >> "${win_output_loc}/conf/default/httpd.conf.in" <<EOF
+# MOD_CLUSTER_ADDS
+# Adjust to you hostname and subnet.
+<IfModule manager_module>
+ Listen 127.0.0.1:6666
+ ManagerBalancerName mycluster
+ <VirtualHost 127.0.0.1:6666>
+ <Directory />
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0
+ </Directory>
+
+ KeepAliveTimeout 300
+ MaxKeepAliveRequests 0
+ #ServerAdvertise on http://@IP@:6666
+ AdvertiseFrequency 5
+ #AdvertiseSecurityKey secret
+ #AdvertiseGroup @ADVIP@:23364
+
+ <Location /mod_cluster_manager>
+ SetHandler mod_cluster-manager
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0
+ </Location>
+
+ </VirtualHost>
+</IfModule>
+EOF
+ ;;
+esac
+
echo "Done"
exit 0
13 years, 10 months
JBoss Native SVN: r2725 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-01-19 10:14:58 -0500 (Wed, 19 Jan 2011)
New Revision: 2725
Modified:
trunk/build/unix/package.list
Log:
mod_cluster back in dev.
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2011-01-13 08:25:44 UTC (rev 2724)
+++ trunk/build/unix/package.list 2011-01-19 15:14:58 UTC (rev 2725)
@@ -48,8 +48,8 @@
mod_cluster|1.0.4.GA|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.0.4.GA
mod_cluster|1.1.0.Final|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.1.0.Final
mod_cluster|1.0.5.GA|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.0.5.GA
-mod_cluster|1.1.1.dev|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
mod_cluster|1.0.6.dev|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:branches/1.0.x
mod_cluster|1.0.6.GA|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.0.6.GA
+mod_cluster|1.1.1.dev|2.2.15|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
traffic_server|TS_Trunk|trunk
TC7|TC7_Trunk|trunk
13 years, 10 months