From 9a992a86cbc64f0a8a140fcce8b1ec3f675e42d5 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 12 Jan 2016 13:52:32 -0500 Subject: [PATCH] Try this without the url prefix. --- roles/haproxy/templates/haproxy.cfg | 2 +- roles/haproxy/templates/haproxy.cfg.stg | 2 +- roles/pdc/frontend/templates/pdc.conf | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 71e652a1a0..4b180bda4d 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -226,7 +226,7 @@ listen pdc 0.0.0.0:10045 balance hdr(appserver) server pdc-web01 pdc-web01:80 check inter 10s rise 1 fall 2 server pdc-web02 pdc-web02:80 check inter 10s rise 1 fall 2 - option httpchk GET /pdc/rest_api/v1/ + option httpchk GET /rest_api/v1/ # Apache doesn't handle the initial connection here like the other proxy # entries. This proxy also doesn't use the http mode like the others. diff --git a/roles/haproxy/templates/haproxy.cfg.stg b/roles/haproxy/templates/haproxy.cfg.stg index fafd58660b..e010434401 100644 --- a/roles/haproxy/templates/haproxy.cfg.stg +++ b/roles/haproxy/templates/haproxy.cfg.stg @@ -204,7 +204,7 @@ listen openqa 0.0.0.0:10044 listen pdc 0.0.0.0:10045 balance hdr(appserver) server pdc-web01 pdc-web01:80 check inter 10s rise 1 fall 2 - option httpchk GET /pdc/rest_api/v1/ + option httpchk GET /rest_api/v1/ # Apache doesn't handle the initial connection here like the other proxy # entries. This proxy also doesn't use the http mode like the others. diff --git a/roles/pdc/frontend/templates/pdc.conf b/roles/pdc/frontend/templates/pdc.conf index 94c52b9a4d..1208623c68 100644 --- a/roles/pdc/frontend/templates/pdc.conf +++ b/roles/pdc/frontend/templates/pdc.conf @@ -1,5 +1,5 @@ -Alias /pdc/docs/ /usr/share/doc/pdc/docs/build/html/ -Alias /pdc/saml2protected /usr/share/ipsilon/ui/saml2sp +Alias /docs/ /usr/share/doc/pdc/docs/build/html/ +Alias /saml2protected /usr/share/ipsilon/ui/saml2sp WSGIDaemonProcess pdc user=apache group=apache maximum-requests=1000 display-name=pdc processes={{ wsgi_procs }} threads={{ wsgi_threads }} WSGISocketPrefix run/wsgi @@ -7,14 +7,14 @@ WSGIRestrictStdout On WSGIRestrictSignal Off WSGIPythonOptimize 1 -WSGIScriptAlias /pdc/ /usr/lib/python2.7/site-packages/pdc/wsgi.py +WSGIScriptAlias / /usr/lib/python2.7/site-packages/pdc/wsgi.py RewriteEngine on # First try to find the files in pdc RewriteCond "/usr/lib/python2.7/site-packages/pdc/static/$1" -f -RewriteRule "^/pdc/static/(.*)" "/usr/lib/python2.7/site-packages/pdc/static/$1" [L] +RewriteRule "^/static/(.*)" "/usr/lib/python2.7/site-packages/pdc/static/$1" [L] # Try to find them in the patternfly files -RewriteRule "^/pdc/static/(.*)" "/usr/share/patternfly1/resources/$1" [L] +RewriteRule "^/static/(.*)" "/usr/share/patternfly1/resources/$1" [L] SetHandler wsgi-script