From e31ba0d65b7683d9cb3ecf5f4dcf141511ed3314 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Fri, 15 Mar 2019 20:08:00 +0000
Subject: [PATCH] taskotron: changing location directives to make ws work

the <Location/> directives were in the wrong order and the ws requests
were being swallowed by the wrong directive.
---
 .../buildmaster/templates/buildmaster.conf.j2       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/roles/taskotron/buildmaster/templates/buildmaster.conf.j2 b/roles/taskotron/buildmaster/templates/buildmaster.conf.j2
index 5bba540082..8bc6596923 100644
--- a/roles/taskotron/buildmaster/templates/buildmaster.conf.j2
+++ b/roles/taskotron/buildmaster/templates/buildmaster.conf.j2
@@ -1,3 +1,10 @@
+<Location /{{ buildmaster_endpoint }}/ >
+  ProxyPass "http://127.0.0.1:8010/"
+  ProxyPassReverse "http://127.0.0.1:8010/"
+
+  ProxyPreserveHost On
+</Location>
+
 <Location /{{ buildmaster_endpoint }}/ws >
   ProxyPass "ws://127.0.0.1:8010/ws"
   ProxyPassReverse "ws://127.0.0.1:8010/ws"
@@ -5,9 +12,3 @@
   ProxyPreserveHost On
 </Location>
 
-<Location /{{ buildmaster_endpoint }}/ >
-  ProxyPass "http://127.0.0.1:8010/"
-  ProxyPassReverse "http://127.0.0.1:8010/"
-
-  ProxyPreserveHost On
-</Location>