From 3003f4634736f04f8a40a1af7b45ab919c79db3f Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 17 Dec 2013 22:23:24 -0800
Subject: [PATCH] Use special bind path for panel

---
 packages/webapp/webapp_server.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 39659910c8..a608cdeb01 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -586,12 +586,16 @@ var runWebAppServer = function () {
                 // XXX Figure out a per-job way to specify bind location
                 // (besides hardcoding the location for ADMIN_APP jobs).
                 if (process.env.ADMIN_APP) {
-                  proxyConf = {
-                    bindHost: process.env.GALAXY_NAME,
-                    bindPathPrefix: "/" +
+                  var bindPathPrefix = "";
+                  if (process.env.GALAXY_APP !== "panel") {
+                    bindPathPrefix = "/" + bindPathPrefix +
                       encodeURIComponent(
                         process.env.GALAXY_APP
-                      ).replace(/\./g, '_'),
+                      ).replace(/\./g, '_');
+                  }
+                  proxyConf = {
+                    bindHost: process.env.GALAXY_NAME,
+                    bindPathPrefix: bindPathPrefix,
                     requiresAuth: true
                   };
                 } else {