Update command line to grant domain permission

diff --git a/config.sml b/config.sml
index 2d5f92a..25a4cdb 100644 (file)
--- a/config.sml
+++ b/config.sml
@@ -1,6 +1,6 @@
 structure Config :> CONFIG = struct
 
-val scratchDir = "/afs/hcoop.net/usr/hcoop"
+val scratchDir = "/afs/hcoop.net/user/h/hc/hcoop"
 val urlPrefix = "https://members2.hcoop.net/portal/"
 val emailSuffix = "@hcoop.net"
 val boardEmail = "board" ^ emailSuffix

diff --git a/domain.mlt b/domain.mlt
index 9b7889d..78dc955 100644 (file)
--- a/domain.mlt
+++ b/domain.mlt
@@ -31,7 +31,7 @@ elseif $"cmd" = "open" then
        <br>
        <a href="domain?mod=<% #id req %>">[Modify]</a>
        <a href="domain?del=<% #id req %>">[Delete]</a><br>
-       To set up, run: <tt>domtool.real mkdom <% #data req %>&nbsp;<% name %></tt>
+       To set up, run: <tt>domtool-admin grant <% name %> domain <% #data req %></tt>
 <% end %>
 
 <%     end

diff --git a/mail.sml b/mail.sml
index 4fa6b22..fc370b8 100644 (file)
--- a/mail.sml
+++ b/mail.sml
@@ -1,13 +1,13 @@
 structure Mail :> MAIL =
 struct
 
-fun writeToLog s =
-    let
+fun writeToLog s = ignore (OS.Process.system "klist >/tmp/haha")
+    (*let
        val outf = TextIO.openAppend (Init.scratchDir ^ "/log/mail.log")
     in
        TextIO.output (outf, s);
        TextIO.closeOut outf
-    end
+    end*)
 
 type session = (TextIO.instream, TextIO.outstream) Unix.proc
 

diff --git a/mlt.conf b/mlt.conf
index f27d61d..ac70d76 100644 (file)
--- a/mlt.conf
+++ b/mlt.conf
@@ -6,7 +6,7 @@ after   after
 exn    exn
 
 out    out
-pub    /afs/hcoop.net/usr/hcoop/home/public_html/cgi-bin/portal
+pub    /afs/hcoop.net/user/h/hc/hcoop/public_html/cgi-bin/portal
 
 cm     $/smlnj-lib.cm
 cm     /usr/local/share/smlsql/smlsql.cm

diff --git a/pledge.mlt b/pledge.mlt
index 237a8e0..13ca3dd 100644 (file)
--- a/pledge.mlt
+++ b/pledge.mlt
@@ -18,8 +18,6 @@ end
 
 val user = Init.getUser () %>
 
-<p><b>The pledges on this page will "go live" on Saturday, November 25, 2006. That is, past that point, we will actually bill you based on what you set here.</b></p>
-
 <p>HCoop divides expenses among members based on a "sliding scale"-style scheme. We charge you only for our concrete expenses, not adding any expenses beyond what we pay to service providers and vendors. Whenever a concrete expense needs to be paid for, we divide it among the members based on how much each of you has pledged on this web page. Your pledge is a whole number 1 or higher which you can think of as indicating how many times the amount paid by the lowest-contributing members you are willing to pay. Concretely, every expense is divided by the sum of all members' pledges, and each member is charged an amount equal to the result of that division times his pledge number. This way <i>everyone's</i> monthly costs go down automatically as we gain new members.</p>
 
 <h2>Set your pledge number</h2>