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

fixing taskotron-dev proxy settings for resultsdb and resultsdb_frontend

Browse source
This commit is contained in:
Tim Flink 2014-07-14 12:59:02 +00:00
parent 575ea5135a
commit 38b2a5fc75
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/group_vars/taskotron-dev
View file

@ -22,8 +22,8 @@ master_dir: /home/buildmaster/master
master_user: buildmaster master_user: buildmaster
external_hostname: taskotron.dev.fedoraproject.org external_hostname: taskotron.dev.fedoraproject.org
resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0 resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0
resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/ resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb
resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/ resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb_api/
resultsdb_endpoint: resultsdb resultsdb_endpoint: resultsdb
resultsdb_api_endpoint: resultsdb_api resultsdb_api_endpoint: resultsdb_api
landingpage_title: "Taskotron Development" landingpage_title: "Taskotron Development"

4
roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2
View file

@ -5,7 +5,7 @@
</Location> </Location>
<Location /{{ resultsdb_api_endpoint }}/ > <Location /{{ resultsdb_api_endpoint }}/ >
ProxyPass {{ resultsdb_url }} ProxyPass {{ resultsdb_external_url }}
ProxyPassReverse {{ resultsdb_url }} ProxyPassReverse {{ resultsdb_external_url }}
RequestHeader add X-Script-Name /{{ resultsdb_api_endpoint }}/ RequestHeader add X-Script-Name /{{ resultsdb_api_endpoint }}/
</Location> </Location>