diff server/resources/symbolServerSettings.jsp @ 33:76233e3aceb7

auth settings reworked
author Evgeniy.Koshkin
date Mon, 12 Aug 2013 20:57:13 +0400
parents 2ae714d6faa5
children 53abede95333
line wrap: on
line diff
--- a/server/resources/symbolServerSettings.jsp	Mon Aug 12 16:28:03 2013 +0400
+++ b/server/resources/symbolServerSettings.jsp	Mon Aug 12 20:57:13 2013 +0400
@@ -2,12 +2,26 @@
 
 <jsp:useBean id="pageUrl" type="java.lang.String" scope="request"/>
 <jsp:useBean id="isGuestEnabled" scope="request" type="java.lang.Boolean"/>
-<jsp:useBean id="publicFeedUrl" scope="request" type="java.lang.String" />
+<jsp:useBean id="publicUrl" scope="request" type="java.lang.String" />
+<jsp:useBean id="privateUrl" scope="request" type="java.lang.String" />
 <jsp:useBean id="actualServerUrl" scope="request" type="java.lang.String" />
 
 <table class="runnerFormTable">
   <tr>
-    <th>Symbol Server URL:</th>
+    <td colspan="2">
+      <em>Use this URL in Visual Studio and WinDbg settings.</em>
+    </td>
+  </tr>
+  <tr>
+    <th>Authenticated URL:</th>
+    <td>
+      <c:set var="url"><c:url value="${actualServerUrl}${privateUrl}"/></c:set>
+      <div><a href="${url}">${url}</a></div>
+      <span class="smallNote">Access to the url requires HTTP authentication</span>
+    </td>
+  </tr>
+  <tr>
+    <th>Public URL:</th>
     <td>
       <c:choose>
         <c:when test="${not isGuestEnabled}">
@@ -16,13 +30,13 @@
               Guest user is disabled.
             </span>
             <span class="smallNote">
-              You need to enable guest user login in TeamCity <a href="<c:url value="/admin/admin.html?item=auth"/>">Authentication Settings</a> for Symbol Server to work.
+              You need to enable guest user login in TeamCity <a href="<c:url value="/admin/admin.html?item=auth"/>">Authentication Settings</a> for public url to work.
             </span>
         </c:when>
         <c:otherwise>
-          <c:set var="url"><c:url value="${actualServerUrl}${publicFeedUrl}"/></c:set>
+          <c:set var="url"><c:url value="${actualServerUrl}${publicUrl}"/></c:set>
           <div><a href="${url}">${url}</a></div>
-          <span class="smallNote">Use this URL in Visual Studio and WinDbg settings.</span>
+          <span class="smallNote">No authentication is required.</span>
         </c:otherwise>
       </c:choose>
     </td>