diff options
| -rw-r--r-- | inventory/group_vars/resultsdb-dev | 4 | ||||
| -rw-r--r-- | inventory/group_vars/taskotron-dev | 3 | ||||
| -rw-r--r-- | inventory/group_vars/taskotron-dev-clients | 2 | ||||
| -rw-r--r-- | roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 | 6 |
4 files changed, 11 insertions, 4 deletions
diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb-dev index 75d38a48b..652351c35 100644 --- a/inventory/group_vars/resultsdb-dev +++ b/inventory/group_vars/resultsdb-dev @@ -21,8 +21,8 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m resultsdb_db_host: db-qa01.qa.fedoraproject.org resultsdb_db_port: 5432 -resultsdb_endpoint: '/resultsdb' -resultsdb_fe_endpoint: '/' +resultsdb_endpoint: '/resultsdb_api' +resultsdb_fe_endpoint: '/resultsdb' resultsdb_db_name: resultsdb_dev allowed_hosts: - 10.5.124 diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 5adcac5c8..0e95851b3 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -21,10 +21,11 @@ buildslave_dir: /home/buildslave/slave master_dir: /home/buildmaster/master master_user: buildmaster external_hostname: taskotron.dev.fedoraproject.org -resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/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_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/ resultsdb_endpoint: resultsdb +resultsdb_api_endpoint: resultsdb_api landingpage_title: "Taskotron Development" deployment_type: dev tcp_ports: [ 80, 443, "{{ buildslave_port }}" ] diff --git a/inventory/group_vars/taskotron-dev-clients b/inventory/group_vars/taskotron-dev-clients index 6fd110a0b..36104de67 100644 --- a/inventory/group_vars/taskotron-dev-clients +++ b/inventory/group_vars/taskotron-dev-clients @@ -2,7 +2,7 @@ lvm_size: 20000 slave_user: buildslave taskotron_fas_user: taskotron -resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/api/v1.0/ +resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0/ bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi/ kojihub_url: http://koji.fedoraproject.org/kojihub taskotron_master: http://taskotron-dev.fedoraproject.org/taskmaster/ diff --git a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 index 0df322df1..b24f2246d 100644 --- a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 +++ b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 @@ -3,3 +3,9 @@ ProxyPassReverse {{ resultsdb_frontend_url }} RequestHeader add X-Script-Name /{{ resultsdb_endpoint }}/ </Location> + +<Location /{{ resultsdb_api_endpoint }}/ > + ProxyPass {{ resultsdb_url }} + ProxyPassReverse {{ resultsdb_url }} + RequestHeader add X-Script-Name /{{ resultsdb_api_endpoint }}/ +</Location> |