val admin = Group.inGroupName "server";
+val nodeNum = case $"node" of
+ "" => 4
+ | node => Web.stoi node;
+
if $"new" <> "" then
val pkgs = String.tokens Char.isSpace ($"new");
ref infos = [];
foreach pkg in pkgs do
- switch AptQuery.query pkg of
+ switch AptQuery.query {node = nodeNum, pkg = pkg} of
NONE =>
ok := false;
%><b>Error</b>: Unknown package "<% Web.html pkg %>."<br><%
end
end;
- if ok then %>
+ if ok then
+ val debian = Init.nodeDebian nodeNum %>
Are you sure these are the packages you wanted?<br><br>
<table>
<% foreach info in infos do %>
- <tr> <td align="right"><a href="http://packages.debian.org/testing/<% #section info %>/<% #name info %>"><% #name info %></a></td>
+ <tr> <td align="right"><a href="http://packages.debian.org/<% debian %>/<% #section info %>/<% #name info %>"><% #name info %></a></td>
<td><% Web.html (#descr info) %></td> </tr>
<% end %>
</table><br>
<br>
<b>Reason:</b> <blockquote><% Web.htmlNl ($"msg") %></blockquote><br>
- <a href="apt?req=<% foreach info in infos do %><% #name info %>+<% end %>&msg=<% Web.urlEncode ($"msg") %>">Yes, I want to request these packages.</a>
+ <a href="apt?node=<% nodeNum %>&req=<% foreach info in infos do %><% #name info %>+<% end %>&msg=<% Web.urlEncode ($"msg") %>">Yes, I want to request these packages.</a>
<% end
ref ok = true;
foreach pkg in pkgs do
- switch AptQuery.query pkg of
+ switch AptQuery.query {node = nodeNum, pkg = pkg} of
NONE =>
ok := false;
%><b>Error</b>: Unknown package "<% Web.html pkg %>."<br><%
end;
if ok then
- val id = Apt.add (Init.getUserId(), $"req", $"msg");
+ val id = Apt.add {usr = Init.getUserId(), node = nodeNum, data = $"req", msg = $"msg"};
if not (Apt.notifyNew id) then
%><h3>Error sending e-mail notification</h3><%
end
<br><hr><br>
<table class="blanks">
<tr> <td>By:</td> <td colspan="2"><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td colspan="2"><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td colspan="2"><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
+<tr> <td>Node:</td> <td colspan="2"><% Web.html (Init.nodeName (#node req)) %></td> </tr>
<tr> <td>Packages:</td><%
ref first = true;
val pkgs = String.tokens Char.isSpace (#data req);
+ val debian = Init.nodeDebian (#node req);
foreach pkg in pkgs do
if first then
else
%></tr><tr> <td></td><%
end;
- switch AptQuery.query pkg of
+ switch AptQuery.query {node = #node req, pkg = pkg} of
NONE =>
%><td></td> <td><b>Error</b>: Unknown package "<% Web.html pkg %>."</td><%
| SOME info =>
- %><td align="right"><a href="http://packages.debian.org/testing/<% #section info %>/<% #name info %>"><% #name info %></a></td>
+ %><td align="right"><a href="http://packages.debian.org/<% debian %>/<% #section info %>/<% #name info %>"><% #name info %></a></td>
<td><% Web.html (#descr info) %></td><%
end
end %>
<br>
<a href="apt?mod=<% #id req %>">[Modify]</a>
<a href="apt?del=<% #id req %>">[Delete]</a><br>
- To install, run: <tt>apt-get install<% foreach pkg in pkgs do %> <% pkg %><% end %></tt>
+ To install on a node controlled by Puppet, declare <tt>package { [ <% foreach pkg in pkgs do %>'<% Web.html pkg %>', <% end %> ]: }</tt> in manifest <tt>hcoop::server::<% Web.html (Init.nodeName (#node req)) %></tt>. If the node is not managed by Puppet, run: <tt>apt-get install<% foreach pkg in pkgs do %> <% Web.html pkg %><% end %></tt>.
<% end %>
<% end
<br><hr><br>
<table class="blanks">
<tr> <td>By:</td> <td colspan="2"><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td colspan="2"><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td colspan="2"><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
+<tr> <td>Node:</td> <td colspan="2"><% Web.html (Init.nodeName (#node req)) %></td> </tr>
<tr> <td>Packages:</td><%
ref first = true;
val pkgs = String.tokens Char.isSpace (#data req);
+ val debian = Init.nodeDebian (#node req);
foreach pkg in pkgs do
if first then
else
%></tr><tr> <td></td><%
end;
- switch AptQuery.query pkg of
+ switch AptQuery.query {node = #node req, pkg = pkg} of
NONE =>
%><td></td> <td><b>Error</b>: Unknown package "<% Web.html pkg %>."</td><%
| SOME info =>
- %><td align="right"><a href="http://packages.debian.org/testing/<% #section info %>/<% #name info %>"><% #name info %></a></td>
+ %><td align="right"><a href="http://packages.debian.org/<% debian %>/<% #section info %>/<% #name info %>"><% #name info %></a></td>
<td><% Web.html (#descr info) %></td><%
end
end %>
<input type="hidden" name="save" value="<% id %>">
<table class="blanks">
<tr> <td>Requestor:</td> <td><a href="user?id=<% #usr req %>"><% #name user %></a></td> </tr>
-<tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
+<tr> <td>Node:</td> <td><select name="node">
+<% foreach node in Init.listNodes () do %>
+ <option value="<% #id node %>"<% if #id node = #node req then %> selected<% end %>><% Web.html (#name node) %> (<% Web.html (#descr node) %>; Debian <% Web.html (#debian node) %>)</option>
+<% end %>
+</select>
<tr> <td>Status:</td> <td><select name="status">
<option value="0"<% if #status req = Apt.NEW then %> selected<% end %>>New</option>
<option value="1"<% if #status req = Apt.INSTALLED then %> selected<% end %>>Installed</option>
<% elseif $"save" <> "" then
Group.requireGroupName "server";
val id = Web.stoi ($"save");
+ val node = Web.stoi ($"node");
val req = Apt.lookup id;
val oldStatus = #status req;
val newStatus = Apt.statusFromInt (Web.stoi ($"status"));
- Apt.modify {req with data = $"pkgs", msg = $"msg", status = newStatus};
- if oldStatus <> newStatus then
- if not (Apt.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
- %><h3>Error sending e-mail notification</h3><%
- end
+ Apt.modify {req with node = node, data = $"pkgs", msg = $"msg", status = newStatus};
+ if not (Apt.notifyMod {old = oldStatus, new = newStatus, changer = Init.getUserName(), req = id}) then
+ %><h3>Error sending e-mail notification</h3><%
end
%><h3>Request modified</h3>
Back to: <a href="apt?cmd=open">open requests</a>, <a href="apt?cmd=list">all requests</a>
<h3>Request new installations</h3>
-List the package names you'd like, separated by any whitespace characters.
+List the package names you'd like, separated by any whitespace
+characters. If you want the version of a package from <a
+href="http://backports-master.debian.org/">backports</a>, specify that
+in the "Reason" field.
<form action="apt" method="post">
<table class="blanks">
-<tr> <td>Packages:</td> <td><textarea name="new" rows="10" cols="40" wrap="soft"></textarea></td> </tr>
+<tr> <td>Machine:</td> <td><select name="node">
+<% foreach node in Init.listNodes () do %>
+ <option value="<% #id node %>"<% if #id node = nodeNum then %> selected<% end %>><% Web.html (#name node) %> (<% Web.html (#descr node) %>; Debian <% Web.html (#debian node) %>)</option>
+<% end %>
+</select></td></tr>
+<tr> <td>Packages:</td> <td><textarea name="new" rows="10" cols="40" wrap="soft" required="required"></textarea></td> </tr>
<tr> <td>Reason:</td> <td><textarea name="msg" rows="5" cols="80" wrap="soft"></textarea></td> </tr>
<tr> <td><input type="submit" value="Request"></td> </tr>
</table>
HCoop / hcoop / portal.git / blobdiff