Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: cleanup: apache proxy configuration ......................................................................
packaging: setup: cleanup: apache proxy configuration Change-Id: I3a48057e937c8a0c5facc169648d9067edbf0927 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/conf/ovirt-engine-proxy.conf.v2.in 1 file changed, 2 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/20785/1 diff --git a/packaging/conf/ovirt-engine-proxy.conf.v2.in b/packaging/conf/ovirt-engine-proxy.conf.v2.in index 1b8a091..2aac236 100644 --- a/packaging/conf/ovirt-engine-proxy.conf.v2.in +++ b/packaging/conf/ovirt-engine-proxy.conf.v2.in @@ -22,44 +22,12 @@ RequestHeader unset Expect early </IfModule> - <Proxy ajp://127.0.0.1:@JBOSS_AJP_PORT@> - # This is needed to make sure that connections to the application server - # are recovered in a short time interval (5 seconds at the moment) - # otherwise when the application server is restarted the web server will - # refuse to connect during 60 seconds. - ProxySet retry=5 + <LocationMatch ^/(ovirt-engine($|/)|api($|/)|RHEVManagerWeb/|OvirtEngineWeb/|ca.crt$|engine.ssh.key.txt$|rhevm.ssh.key.txt$)> + ProxyPassMatch ajp://127.0.0.1:@JBOSS_AJP_PORT@ timeout=3600 - # This is needed to make sure that long RESTAPI requests have time to - # finish before the web server aborts the request as the default timeout - # (controlled by the Timeout directive in httpd.conf) is 60 seconds. - ProxySet timeout=3600 - </Proxy> - - <Location /ovirt-engine> - ProxyPass ajp://127.0.0.1:@JBOSS_AJP_PORT@/ovirt-engine - <IfModule deflate_module> - AddOutputFilterByType DEFLATE text/javascript text/css text/html text/xml text/json application/xml application/json application/x-yaml - </IfModule> - </Location> - - <LocationMatch ^RHEVManagerWeb/|OvirtEngineWeb/|ca.crt$|engine.ssh.key.txt$|rhevm.ssh.key.txt$> - ProxyPassMatch ajp://127.0.0.1:@JBOSS_AJP_PORT@ <IfModule deflate_module> AddOutputFilterByType DEFLATE text/javascript text/css text/html text/xml text/json application/xml application/json application/x-yaml </IfModule> </LocationMatch> - - <Location /api> - # - # The timeout has to be specified here again because versions of - # Apache older than 2.4 don't copy the setting from the Proxy - # directive: - # - ProxyPass ajp://127.0.0.1:@JBOSS_AJP_PORT@/api timeout=3600 - - <IfModule deflate_module> - AddOutputFilterByType DEFLATE text/javascript text/css text/html text/xml text/json application/xml application/json application/x-yaml - </IfModule> - </Location> </IfModule> -- To view, visit http://gerrit.ovirt.org/20785 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a48057e937c8a0c5facc169648d9067edbf0927 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
