Author: jsdelfino
Date: Tue May 29 07:37:39 2012
New Revision: 1343580
URL: http://svn.apache.org/viewvc?rev=1343580&view=rev
Log:
Fix server config of server-status and proxy balancer-manager pages.
Modified:
tuscany/sca-cpp/trunk/modules/http/httpd-conf
tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
tuscany/sca-cpp/trunk/modules/http/proxy-base-conf
tuscany/sca-cpp/trunk/modules/http/proxy-conf
tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-conf?rev=1343580&r1=1343579&r2=1343580&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-conf Tue May 29 07:37:39 2012
@@ -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 ${module
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
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf?rev=1343580&r1=1343579&r2=1343580&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf Tue May 29 07:37:39 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/http/proxy-base-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/proxy-base-conf?rev=1343580&r1=1343579&r2=1343580&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/proxy-base-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/proxy-base-conf Tue May 29 07:37:39 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/http/proxy-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/proxy-conf?rev=1343580&r1=1343579&r2=1343580&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/proxy-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/proxy-conf Tue May 29 07:37:39 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf?rev=1343580&r1=1343579&r2=1343580&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf Tue May 29 07:37:39 2012
@@ -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
