Update proper Domtool username for package/security queries

diff --git a/aptquery.sml b/aptquery.sml
index 39b37ef..6818938 100644 (file)
--- a/aptquery.sml
+++ b/aptquery.sml
@@ -33,7 +33,7 @@ fun query {node, pkg = name} =
            let
                val _ = Unix.reap proc
 
-               val installed = OS.Process.isSuccess (OS.Process.system ("DOMTOOL_USER=apache2.deleuze.hcoop.net /usr/local/bin/domtool-admin package " ^ Init.nodeName node ^ " " ^ name ^ " >/dev/null 2>/dev/null"))
+               val installed = OS.Process.isSuccess (OS.Process.system ("DOMTOOL_USER=hcoop /usr/local/bin/domtool-admin package " ^ Init.nodeName node ^ " " ^ name ^ " >/dev/null 2>/dev/null"))
            in
                SOME {name = name, section = section, descr = descr, installed = installed}
            end

diff --git a/pref.mlt b/pref.mlt
index e86826f..1db9f8b 100644 (file)
--- a/pref.mlt
+++ b/pref.mlt
@@ -35,6 +35,8 @@ if $"cmd" = "mod" then
        %><h3>Preferences updated</h3><%
 end %>
 
+<p><h3>This page doesn't work yet.  You should visit <a href="https://members.hcoop.net/portal/pref">the corresponding page on the old portal</a> if you want to change anything.</h3></p>
+
 <form action="pref" method="post">
 <input type="hidden" name="cmd" value="mod">
 <table class="blanks">

diff --git a/sec.sml b/sec.sml
index b064a5f..5712940 100644 (file)
--- a/sec.sml
+++ b/sec.sml
@@ -45,7 +45,7 @@ fun socketPerms {node, uname} =
     let
        val proc = Unix.execute ("/bin/sh",
                                 ["-c",
-                                 "DOMTOOL_USER=apache2.deleuze.hcoop.net /usr/local/bin/domtool-admin sockperm "
+                                 "DOMTOOL_USER=hcoop /usr/local/bin/domtool-admin sockperm "
                                  ^ Init.nodeName node ^ " " ^ uname])
                   
        val inf = Unix.textInstreamOf proc
@@ -65,7 +65,7 @@ fun socketPerms {node, uname} =
 
 fun checkIt cmd {node, uname} =
     OS.Process.isSuccess (OS.Process.system
-                             ("DOMTOOL_USER=apache2.deleuze.hcoop.net /usr/local/bin/domtool-admin "
+                             ("DOMTOOL_USER=hcoop /usr/local/bin/domtool-admin "
                               ^ cmd ^ " " ^ Init.nodeName node ^ " " ^ uname ^ " >/dev/null 2>/dev/null"))
 
 val isTpe = checkIt "tpe"
@@ -76,7 +76,7 @@ fun findFirewallRules {node, uname} =
     let
        val proc = Unix.execute ("/bin/sh",
                                 ["-c",
-                                 "DOMTOOL_USER=apache2.deleuze.hcoop.net /usr/local/bin/domtool-admin firewall "
+                                 "DOMTOOL_USER=hcoop /usr/local/bin/domtool-admin firewall "
                                  ^ Init.nodeName node ^ " " ^ uname])
                   
        val inf = Unix.textInstreamOf proc