Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Try this without the url prefix.

Browse source
This commit is contained in:
Ralph Bean 2016-01-12 13:52:32 -05:00
parent 4ee07e345a
commit 9a992a86cb
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/haproxy/templates/haproxy.cfg
View file

@ -226,7 +226,7 @@ listen pdc 0.0.0.0:10045
balance hdr(appserver) balance hdr(appserver)
server pdc-web01 pdc-web01:80 check inter 10s rise 1 fall 2 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 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 # 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. # entries. This proxy also doesn't use the http mode like the others.

2
roles/haproxy/templates/haproxy.cfg.stg
View file

@ -204,7 +204,7 @@ listen openqa 0.0.0.0:10044
listen pdc 0.0.0.0:10045 listen pdc 0.0.0.0:10045
balance hdr(appserver) balance hdr(appserver)
server pdc-web01 pdc-web01:80 check inter 10s rise 1 fall 2 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 # 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. # entries. This proxy also doesn't use the http mode like the others.

10
roles/pdc/frontend/templates/pdc.conf
View file

@ -1,5 +1,5 @@
Alias /pdc/docs/ /usr/share/doc/pdc/docs/build/html/ Alias /docs/ /usr/share/doc/pdc/docs/build/html/
Alias /pdc/saml2protected /usr/share/ipsilon/ui/saml2sp 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 }} WSGIDaemonProcess pdc user=apache group=apache maximum-requests=1000 display-name=pdc processes={{ wsgi_procs }} threads={{ wsgi_threads }}
WSGISocketPrefix run/wsgi WSGISocketPrefix run/wsgi
@ -7,14 +7,14 @@ WSGIRestrictStdout On
WSGIRestrictSignal Off WSGIRestrictSignal Off
WSGIPythonOptimize 1 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 RewriteEngine on
# First try to find the files in pdc # First try to find the files in pdc
RewriteCond "/usr/lib/python2.7/site-packages/pdc/static/$1" -f 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 # 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]
<Location "/"> <Location "/">
SetHandler wsgi-script SetHandler wsgi-script