diff options
| author | Tim Flink <tflink@fedoraproject.org> | 2015-04-29 14:46:47 +0000 |
|---|---|---|
| committer | Tim Flink <tflink@fedoraproject.org> | 2015-04-29 14:46:53 +0000 |
| commit | 7a62307f71855e764b44035a3b9f217489a04d3a (patch) | |
| tree | 3ad65e28625a8ee5e5f999c8c9aae00db1b66183 | |
| parent | 55549bc57e9420ef26b8991aaddcd4b4ec138618 (diff) | |
| download | ansible-7a62307f71855e764b44035a3b9f217489a04d3a.tar.gz ansible-7a62307f71855e764b44035a3b9f217489a04d3a.tar.xz ansible-7a62307f71855e764b44035a3b9f217489a04d3a.zip | |
properly fixing httpd configuration so resultsdb_api works publicly in taskotron-dev
| -rw-r--r-- | inventory/group_vars/taskotron-dev | 1 | ||||
| -rw-r--r-- | roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 200c7511a..83958240c 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -25,6 +25,7 @@ execdb_server: http://resultsdb-dev01.qa.fedoraproject.org/execdb execdb_statuspush: http://resultsdb-dev01.qa.fedoraproject.org/execdb/buildbottest execdb_endpoint: execdb resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0 +resultsdb_host: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/ resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/ resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/ resultsdb_fe_endpoint: resultsdb diff --git a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 index 2999833e0..07392ceff 100644 --- a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 +++ b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 @@ -5,7 +5,7 @@ </Location> <Location /{{ resultsdb_api_endpoint }}/ > - ProxyPass {{ resultsdb_url }} - ProxyPassReverse {{ resultsdb_url }} + ProxyPass {{ resultsdb_host }} + ProxyPassReverse {{ resultsdb_host }} RequestHeader add X-Script-Name /{{ resultsdb_api_endpoint }}/ </Location> |