Fix server config of server-status and proxy balancer-manager pages.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1343580 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 19 insertions, 20 deletions

diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index 5b034c7928..54154e119e 100755
--- a/sca-cpp/trunk/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
@@ -135,20 +135,12 @@ ServerName http://$host$pportsuffix
 RewriteEngine on
 RewriteCond %{HTTP_HOST} !^$host [NC]
 RewriteCond %{HTTP:X-Forwarded-Server} ^$ [NC]
+RewriteCond %{REQUEST_URI} !^/server-status [NC]
+RewriteCond %{REQUEST_URI} !^/balancer-manager [NC]
+RewriteCond %{REQUEST_URI} !^/proxy/ [NC]
 RewriteRule .* http://$host$pportsuffix%{REQUEST_URI} [R]
 </Location>
 
-# Enable server status
-<Location /server-status>
-SetHandler server-status
-HostnameLookups on
-</Location>
-
-<Location /server-info>
-SetHandler server-info
-HostnameLookups on
-</Location>
-
 Include conf/svhost.conf
 
 # Configure authentication
@@ -210,7 +202,6 @@ LoadModule socache_shmcb_module ${modules_prefix}/modules/mod_socache_shmcb.so
 LoadModule rewrite_module ${modules_prefix}/modules/mod_rewrite.so
 LoadModule mime_module ${modules_prefix}/modules/mod_mime.so
 LoadModule status_module ${modules_prefix}/modules/mod_status.so
-LoadModule info_module ${modules_prefix}/modules/mod_info.so
 LoadModule negotiation_module ${modules_prefix}/modules/mod_negotiation.so
 LoadModule dir_module ${modules_prefix}/modules/mod_dir.so
 LoadModule setenvif_module ${modules_prefix}/modules/mod_setenvif.so
@@ -296,15 +287,11 @@ EOF
 
 cat >$root/conf/adminauth.conf <<EOF
 
-# Allow the server admin to view the server status and info
+# Allow the server admin to view the server status
 <Location /server-status>
 Require user admin
 </Location>
 
-<Location /server-info>
-Require user admin
-</Location>
-
 EOF
 
 # Create password and group files
@@ -347,6 +334,12 @@ ProxyRequests Off
 ProxyPreserveHost Off
 ProxyStatus On
 
+# Enable server status
+<Location /server-status>
+SetHandler server-status
+HostnameLookups on
+</Location>
+
 EOF
 
 cat >$root/conf/svhost.conf <<EOF
diff --git a/sca-cpp/trunk/modules/http/httpd-ssl-conf b/sca-cpp/trunk/modules/http/httpd-ssl-conf
index b5f82d9690..3cb90d61e0 100755
--- a/sca-cpp/trunk/modules/http/httpd-ssl-conf
+++ b/sca-cpp/trunk/modules/http/httpd-ssl-conf
@@ -71,6 +71,9 @@ ServerName https://$host$sslpportsuffix
 RewriteEngine on
 RewriteCond %{HTTP_HOST} !^$host [NC]
 RewriteCond %{HTTP:X-Forwarded-Server} ^$ [NC]
+RewriteCond %{REQUEST_URI} !^/server-status [NC]
+RewriteCond %{REQUEST_URI} !^/balancer-manager [NC]
+RewriteCond %{REQUEST_URI} !^/proxy/ [NC]
 RewriteRule .* https://$host$sslpportsuffix%{REQUEST_URI} [R]
 </Location>
 
@@ -183,6 +186,12 @@ SSLProxyVerify require
 SSLProxyVerifyDepth 1
 SSLProxyCheckPeerCN Off
 
+# Enable server status
+<Location /server-status>
+SetHandler server-status
+HostnameLookups on
+</Location>
+
 EOF
 
 # Generate tracking configuration
diff --git a/sca-cpp/trunk/modules/http/proxy-base-conf b/sca-cpp/trunk/modules/http/proxy-base-conf
index cbd62bcc14..377175328d 100755
--- a/sca-cpp/trunk/modules/http/proxy-base-conf
+++ b/sca-cpp/trunk/modules/http/proxy-base-conf
@@ -27,7 +27,6 @@ cat >>$root/conf/vhost.conf <<EOF
 # Do not proxy admin pages
 ProxyPass /balancer-manager !
 ProxyPass /server-status !
-ProxyPass /server-info !
 ProxyPass /proxy !
 
 # Enable balancer manager
diff --git a/sca-cpp/trunk/modules/http/proxy-conf b/sca-cpp/trunk/modules/http/proxy-conf
index dd51a34b5b..ce990bbfd3 100755
--- a/sca-cpp/trunk/modules/http/proxy-conf
+++ b/sca-cpp/trunk/modules/http/proxy-conf
@@ -27,7 +27,6 @@ cat >>$root/conf/vhost.conf <<EOF
 # Do not proxy admin pages
 ProxyPass /balancer-manager !
 ProxyPass /server-status !
-ProxyPass /server-info !
 ProxyPass /proxy !
 
 # Enable load balancing
diff --git a/sca-cpp/trunk/modules/http/proxy-ssl-conf b/sca-cpp/trunk/modules/http/proxy-ssl-conf
index 150cf88b60..1d6ed9693a 100755
--- a/sca-cpp/trunk/modules/http/proxy-ssl-conf
+++ b/sca-cpp/trunk/modules/http/proxy-ssl-conf
@@ -27,7 +27,6 @@ cat >>$root/conf/vhost-ssl.conf <<EOF
 # Do not proxy admin pages
 ProxyPass /balancer-manager !
 ProxyPass /server-status !
-ProxyPass /server-info !
 ProxyPass /proxy !
 
 # Enable load balancing