payment: note that Stripe has instituted an additional 1% fee for non-US cards

[hcoop/portal.git] / apt.mlt

diff --git a/apt.mlt b/apt.mlt
index b5c808b..d5a3e06 100644 (file)
--- a/apt.mlt
+++ b/apt.mlt
@@ -106,7 +106,7 @@ elseif $"cmd" = "open" then
        <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 %>&nbsp;<% 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 %>&nbsp;<% Web.html pkg %><% end %></tt>.
 <% end %>
 
 <%     end
@@ -213,7 +213,10 @@ elseif $"mod" <> "" then
 
 <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">
@@ -222,7 +225,7 @@ List the package names you'd like, separated by any whitespace characters.
        <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"></textarea></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>