From 38b2a5fc7532628358fa517141123441a887cba4 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 14 Jul 2014 12:59:02 +0000 Subject: [PATCH] fixing taskotron-dev proxy settings for resultsdb and resultsdb_frontend --- inventory/group_vars/taskotron-dev | 4 ++-- roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 3c27898079..2245d88673 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -22,8 +22,8 @@ master_dir: /home/buildmaster/master master_user: buildmaster external_hostname: taskotron.dev.fedoraproject.org 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_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb +resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb_api/ resultsdb_endpoint: resultsdb resultsdb_api_endpoint: resultsdb_api landingpage_title: "Taskotron Development" diff --git a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 index b24f2246da..dc3568d764 100644 --- a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 +++ b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 @@ -5,7 +5,7 @@ - ProxyPass {{ resultsdb_url }} - ProxyPassReverse {{ resultsdb_url }} + ProxyPass {{ resultsdb_external_url }} + ProxyPassReverse {{ resultsdb_external_url }} RequestHeader add X-Script-Name /{{ resultsdb_api_endpoint }}/