Check whether scriptsVhostPoolUserSelectable is TRUE and allow changing $locker.scripts.mit.edu pool but not path.

Author: miriam-rittenberg

scriptspony/templates/edit.mak

@@ -10,12 +10,16 @@ from scripts.auth import token
   <ul>
     <li>Hostname: ${hostname}</li>
     <li>Locker: ${locker}</li>
+%if hostname not in [locker + '.scripts.mit.edu']:
     <li>Path: /mit/${locker}/web_scripts/<input type="text" name="path" value="${path}" /></li>
-    <li>Server Pool: ${pool} <select name="pool">
+    %endif
+    <li>Server Pool: ${pool["description"]} <select name="pool">
     <option value="unchanged">Unchanged</option>
     <option value="default">Default</option>
-    %for ip, description in pools.items():
-    <option value="${ip}">${description}</option>
+    %for ip, info in pools.items():
+       %if info["scriptsVhostPoolUserSelectable"] == "TRUE":
+          <option value="${ip}">${info["description"]}</option>
+       %endif
     %endfor
     </select></li>
   </ul>

scriptspony/templates/index.mak

@@ -22,18 +22,14 @@ from scripts import auth
 	    <small>/mit/${locker}/web_scripts/</small>${path}
 	  </td>
 	  <td>
-	  <big>${pool}</big>
+	  ${pool["description"]}
 	  </td>
-          %if host not in (locker+'.scripts.mit.edu',):
             <td class="nbr">
               <a href="${tg.url('/edit/'+locker+'/'+host)}" class="btn sm-btn" aria-label="Edit"><span class="fa fa-pencil" aria-hidden="true"></span></a>
               %if host.lower().endswith('.'+locker+'.scripts.mit.edu') or not host.lower().endswith('.mit.edu'):
                 <a href="${tg.url('/delete/'+locker+'/'+host)}" class="btn btn-danger sm-btn" aria-label="Delete"><span class="fa fa-times-circle" aria-hidden="true"></span></a>
               %endif
             </td>
-          %else:
-            <td><span class="edit-btn-disabled"><span class="fa fa-ban"></span></span></td>
-          %endif
         </tr>
       %endfor
     </table>

scriptspony/vhosts.py

@@ -85,10 +85,10 @@ def list_pools():
         "ou=Pools,dc=scripts,dc=mit,dc=edu",
         ldap.SCOPE_ONELEVEL,
         "objectClass=scriptsVhostPool",
-        ["scriptsVhostPoolIPv4", "description"],
+        ["scriptsVhostPoolIPv4", "description", "scriptsVhostPoolUserSelectable"],
     )
     return {
-      m["scriptsVhostPoolIPv4"][0]: m["description"][0]
+            m["scriptsVhostPoolIPv4"][0]: {"description": m["description"][0], "scriptsVhostPoolUserSelectable": m["scriptsVhostPoolUserSelectable"][0]}
       for _, m in res
     }
 
@@ -156,8 +156,6 @@ def set_path(locker, vhost, path):
 @reconnecting
 def set_pool(locker, vhost, pool):
     """Sets the pool of an existing vhost owned by the locker."""
-    if vhost == locker + ".scripts.mit.edu":
-        raise UserError("You cannot reconfigure " + vhost + "!")
     locker = locker.encode("utf-8")
     pool = pool.encode("utf-8")
     scriptsVhostName = get_vhost_name(locker, vhost)