hcoop-cvs Mailing List for Cooperative Internet hosting tools (Page 7)

Update of /cvsroot/hcoop/domtool2/src/plugins
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28000/src/plugins

Modified Files:
	apache.sml 
Log Message:
HCoop IP synonyms; PhpVersion env var

Index: apache.sml
===================================================================
RCS file: /cvsroot/hcoop/domtool2/src/plugins/apache.sml,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** apache.sml	18 Feb 2008 15:52:40 -0000	1.76
--- apache.sml	18 Feb 2008 17:17:44 -0000	1.77
***************
*** 146,150 ****
  		("SuExec",
  		 (TBase "suexec_flag", dl),
! 		 (fn () => (EVar "true", dl)))]
  
  val () = app Defaults.registerDefault defaults
--- 146,153 ----
  		("SuExec",
  		 (TBase "suexec_flag", dl),
! 		 (fn () => (EVar "true", dl))),
! 		("PhpVersion",
! 		 (TBase "php_version", dl),
! 		 (fn () => (EVar "php4", dl)))]
  
  val () = app Defaults.registerDefault defaults
***************
*** 441,444 ****
--- 444,451 ----
  		    app (TextIO.closeOut o #2) (!vhostFiles))
  
+ val php_version = fn (EVar "php4", _) => SOME 4
+ 		   | (EVar "php5", _) => SOME 5
+ 		   | _ => NONE
+ 
  fun vhostBody (env, makeFullHost) =
      let
***************
*** 451,454 ****
--- 458,462 ----
  	val sadmin = Env.env Env.string (env, "ServerAdmin")
  	val suexec = Env.env Env.bool (env, "SuExec")
+ 	val php = Env.env php_version (env, "PhpVersion")
  
  	val fullHost = makeFullHost (Domain.currentDomain ())
***************
*** 516,519 ****
--- 524,534 ----
  				  TextIO.output (file, "/DAVLock");
  
+ 				  if php <> Config.Apache.defaultPhpVersion then
+ 				      (TextIO.output (file, "\n\tAddHandler x-httpd-php");
+ 				       TextIO.output (file, Int.toString php);
+ 				       TextIO.output (file, " .php .phtml"))
+ 				  else
+ 				      ();
+ 
  				  (ld, file)
  			      end)
***************
*** 999,1006 ****
  		      write "\"\n"))
  
- val php_version = fn (EVar "php4", _) => SOME 4
- 		   | (EVar "php5", _) => SOME 5
- 		   | _ => NONE
- 
  val () = Env.action_one "phpVersion"
  	 ("version", php_version)
--- 1014,1017 ----

Update of /cvsroot/hcoop/domtool2/lib
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12848/lib

Modified Files:
	bind.dtl easy_domain.dtl 
Log Message:
bind_patterns

Index: easy_domain.dtl
===================================================================
RCS file: /cvsroot/hcoop/domtool2/lib/easy_domain.dtl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** easy_domain.dtl	1 Jan 2008 23:13:35 -0000	1.22
--- easy_domain.dtl	18 Feb 2008 16:40:08 -0000	1.23
***************
*** 8,12 ****
    \ host : (host) ->
    \\ config : Vhost -> begin
!     dns (dnsA host (ip_of_node (web_node_to_node n)));
  
      vhost host where
--- 8,12 ----
    \ host : (host) ->
    \\ config : Vhost -> begin
!     dns (dnsA (literal host) (ip_of_node (web_node_to_node n)));
  
      vhost host where
***************
*** 23,27 ****
    \ host : (host) ->
    \\ config : Vhost -> begin
!     dns (dnsA host (your_ip_to_ip ip));
  
      vhost host where
--- 23,27 ----
    \ host : (host) ->
    \\ config : Vhost -> begin
!     dns (dnsA (literal host) (your_ip_to_ip ip));
  
      vhost host where
***************
*** 52,56 ****
      dns (dnsNS "ns3.hcoop.net");
  
!     dns (dnsDefaultA (ip_of_node (web_node_to_node web_node)));
  
      handleMail;
--- 52,56 ----
      dns (dnsNS "ns3.hcoop.net");
  
!     dns (dnsA default (ip_of_node (web_node_to_node web_node)));
  
      handleMail;
***************
*** 75,84 ****
  
  val nameserver = \host -> dns (dnsNS host);
! val dnsIP = \from -> \to -> dns (dnsA from to);
! val dnsIPv6 = \from -> \to -> dns (dnsAAAA from to);
  val dnsMail = \num -> \host -> dns (dnsMX num host);
! val dnsAlias = \from -> \to -> dns (dnsCNAME from to);
! val dnsDefault = \to -> dns (dnsDefaultA to);
! val dnsDefaultv6 = \to -> dns (dnsDefaultAAAA to);
! val dnsText = \from -> \to -> dns (dnsTXT from to);
! val dnsDefaultText = \to -> dns (dnsDefaultTXT to);
--- 75,84 ----
  
  val nameserver = \host -> dns (dnsNS host);
! val dnsIP = \from -> \to -> dns (dnsA (literal from) to);
! val dnsIPv6 = \from -> \to -> dns (dnsAAAA (literal from) to);
  val dnsMail = \num -> \host -> dns (dnsMX num host);
! val dnsAlias = \from -> \to -> dns (dnsCNAME (literal from) to);
! val dnsDefault = \to -> dns (dnsA default to);
! val dnsDefaultv6 = \to -> dns (dnsAAAA default to);
! val dnsText = \from -> \to -> dns (dnsTXT (literal from) to);
! val dnsDefaultText = \to -> dns (dnsTXT default to);

Index: bind.dtl
===================================================================
RCS file: /cvsroot/hcoop/domtool2/lib/bind.dtl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** bind.dtl	1 Jan 2008 23:07:50 -0000	1.5
--- bind.dtl	18 Feb 2008 16:40:08 -0000	1.6
***************
*** 6,21 ****
  {{Like <tt>domain</tt>, but may contain underscores}}
  
! extern val dnsA : host -> ip -> dnsRecord;
! extern val dnsAAAA : host -> ipv6 -> dnsRecord;
  extern val dnsAFSDB : domain -> dnsRecord;
! extern val dnsCNAME : host -> domain -> dnsRecord;
  extern val dnsMX : int -> domain -> dnsRecord;
  extern val dnsNS : domain -> dnsRecord;
  extern val dnsSRV : srv_domain -> int -> int -> int -> domain -> dnsRecord;
! extern val dnsTXT : host -> no_newlines -> dnsRecord;
! 
! extern val dnsDefaultA : ip -> dnsRecord;
! extern val dnsDefaultAAAA : ipv6 -> dnsRecord;
! extern val dnsDefaultTXT : no_newlines -> dnsRecord;
  
  extern val dns : dnsRecord -> [Domain] {TTL : int};
--- 6,26 ----
  {{Like <tt>domain</tt>, but may contain underscores}}
  
! extern type bind_pattern;
! {{Ways of describing in which cases a DNS mapping applies}}
! extern val literal : host -> bind_pattern;
! {{A rule applies only to this particular host.}}
! extern val default : bind_pattern;
! {{A rule applies directly to the domain for the current <tt>vhost</tt> block.}}
! extern val wildcard : bind_pattern;
! {{A rule applies to every host within the current domain.}}
! 
! extern val dnsA : bind_pattern -> ip -> dnsRecord;
! extern val dnsAAAA : bind_pattern -> ipv6 -> dnsRecord;
  extern val dnsAFSDB : domain -> dnsRecord;
! extern val dnsCNAME : bind_pattern -> domain -> dnsRecord;
  extern val dnsMX : int -> domain -> dnsRecord;
  extern val dnsNS : domain -> dnsRecord;
  extern val dnsSRV : srv_domain -> int -> int -> int -> domain -> dnsRecord;
! extern val dnsTXT : bind_pattern -> no_newlines -> dnsRecord;
  
  extern val dns : dnsRecord -> [Domain] {TTL : int};

Update of /cvsroot/hcoop/domtool2/src/plugins
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv11665/src/plugins

Modified Files:
	bind.sml 
Log Message:
bind_patterns

Index: bind.sml
===================================================================
RCS file: /cvsroot/hcoop/domtool2/src/plugins/bind.sml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** bind.sml	1 Jan 2008 23:07:50 -0000	1.18
--- bind.sml	18 Feb 2008 16:38:00 -0000	1.19
***************
*** 45,67 ****
  val dl = ErrorMsg.dummyLoc
  
  datatype dns_record =
! 	 A of string * string
!        | CNAME of string * string
         | MX of int * string
         | NS of string
!        | DefaultA of string
!        | AAAA of string * string
!        | DefaultAAAA of string
!        | TXT of string * string
!        | DefaultTXT of string
         | AFSDB of string
         | SRV of string * int * int * int * string
  
  val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
! 		(case (Env.string e1, Domain.ip e2) of
  		     (SOME v1, SOME v2) => SOME (A (v1, v2))
  		   | _ => NONE)
  	      | (EApp ((EApp ((EVar "dnsCNAME", _), e1), _), e2), _) =>
! 		(case (Env.string e1, Env.string e2) of
  		     (SOME v1, SOME v2) => SOME (CNAME (v1, v2))
  		   | _ => NONE)
--- 45,81 ----
  val dl = ErrorMsg.dummyLoc
  
+ datatype host =
+ 	 Literal of string
+        | Wildcard
+        | Default
+ 
  datatype dns_record =
! 	 A of host * string
!        | CNAME of host * string
         | MX of int * string
         | NS of string
!        | AAAA of host * string
!        | TXT of host * string
         | AFSDB of string
         | SRV of string * int * int * int * string
  
+ fun hostS (Literal s) = s ^ "."
+   | hostS Wildcard = "*."
+   | hostS Default = ""
+ 
+ val host = fn (EApp ((EVar "literal", _), e), _) =>
+ 	      Option.map Literal (Env.string e)
+ 	    | (EVar "wildcard", _) =>
+ 	      SOME Wildcard
+ 	    | (EVar "default", _) =>
+ 	      SOME Default
+ 	    | _ => NONE
+ 
  val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
! 		(case (host e1, Domain.ip e2) of
  		     (SOME v1, SOME v2) => SOME (A (v1, v2))
  		   | _ => NONE)
  	      | (EApp ((EApp ((EVar "dnsCNAME", _), e1), _), e2), _) =>
! 		(case (host e1, Env.string e2) of
  		     (SOME v1, SOME v2) => SOME (CNAME (v1, v2))
  		   | _ => NONE)
***************
*** 72,89 ****
  	      | (EApp ((EVar "dnsNS", _), e), _) =>
  		Option.map NS (Env.string e)
- 	      | (EApp ((EVar "dnsDefaultA", _), e), _) =>
- 		Option.map DefaultA (Domain.ip e)
  	      | (EApp ((EApp ((EVar "dnsAAAA", _), e1), _), e2), _) =>
! 		(case (Env.string e1, Env.string e2) of
  		     (SOME v1, SOME v2) => SOME (AAAA (v1, v2))
  		   | _ => NONE)
- 	      | (EApp ((EVar "dnsDefaultAAAA", _), e), _) =>
- 		Option.map DefaultAAAA (Env.string e)
  	      | (EApp ((EApp ((EVar "dnsTXT", _), e1), _), e2), _) =>
! 		(case (Env.string e1, Env.string e2) of
  		     (SOME v1, SOME v2) => SOME (TXT (v1, v2))
  		   | _ => NONE)
- 	      | (EApp ((EVar "dnsDefaultTXT", _), e), _) =>
- 		Option.map DefaultTXT (Env.string e)
  	      | (EApp ((EVar "dnsAFSDB", _), e), _) =>
  		Option.map AFSDB (Env.string e)
--- 86,97 ----
  	      | (EApp ((EVar "dnsNS", _), e), _) =>
  		Option.map NS (Env.string e)
  	      | (EApp ((EApp ((EVar "dnsAAAA", _), e1), _), e2), _) =>
! 		(case (host e1, Env.string e2) of
  		     (SOME v1, SOME v2) => SOME (AAAA (v1, v2))
  		   | _ => NONE)
  	      | (EApp ((EApp ((EVar "dnsTXT", _), e1), _), e2), _) =>
! 		(case (host e1, Env.string e2) of
  		     (SOME v1, SOME v2) => SOME (TXT (v1, v2))
  		   | _ => NONE)
  	      | (EApp ((EVar "dnsAFSDB", _), e), _) =>
  		Option.map AFSDB (Env.string e)
***************
*** 105,110 ****
  	in
  	    case r of
! 		A (from, to) => (write from;
! 				 write ".";
  				 writeDom ();
  				 write ".\t";
--- 113,117 ----
  	in
  	    case r of
! 		A (from, to) => (write (hostS from);
  				 writeDom ();
  				 write ".\t";
***************
*** 113,124 ****
  				 write to;
  				 write "\n")
! 	      | DefaultA to => (writeDom ();
! 				write ".\t";
! 				write (Int.toString ttl);
! 				write "\tIN\tA\t";
! 				write to;
! 				write "\n")
! 	      | CNAME (from, to) => (write from;
! 				     write ".";
  				     writeDom ();
  				     write ".\t";
--- 120,124 ----
  				 write to;
  				 write "\n")
! 	      | CNAME (from, to) => (write (hostS from);
  				     writeDom ();
  				     write ".\t";
***************
*** 141,146 ****
  			    write host;
  			    write ".\n")
! 	      | AAAA (from, to) => (write from;
! 				    write ".";
  				    writeDom ();
  				    write ".\t";
--- 141,145 ----
  			    write host;
  			    write ".\n")
! 	      | AAAA (from, to) => (write (hostS from);
  				    writeDom ();
  				    write ".\t";
***************
*** 149,160 ****
  				    write to;
  				    write "\n")
! 	      | DefaultAAAA to => (writeDom ();
! 				   write ".\t";
! 				   write (Int.toString ttl);
! 				   write "\tIN\tAAAA\t";
! 				   write to;
! 				   write "\n")
! 	      | TXT (from, to) => (write from;
! 				   write ".";
  				   writeDom ();
  				   write ".\t";
--- 148,152 ----
  				    write to;
  				    write "\n")
! 	      | TXT (from, to) => (write (hostS from);
  				   writeDom ();
  				   write ".\t";
***************
*** 163,172 ****
  				   write (String.translate (fn #"\"" => "\\\"" | ch => str ch) to);
  				   write "\"\n")
- 	      | DefaultTXT to => (writeDom ();
- 				  write ".\t";
- 				  write (Int.toString ttl);
- 				  write "\tIN\tTXT\t\"";
- 				  write (String.translate (fn #"\"" => "\\\"" | ch => str ch) to);
- 				  write "\"\n")
  	      | AFSDB host => (writeDom ();
  			       write ".\t";
--- 155,158 ----

Update of /cvsroot/hcoop/domtool2/src/plugins
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25112/src/plugins

Modified Files:
	apache.sml 
Log Message:
Some more mod_autoindex directives

Index: apache.sml
===================================================================
RCS file: /cvsroot/hcoop/domtool2/src/plugins/apache.sml,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** apache.sml	18 Feb 2008 15:32:59 -0000	1.75
--- apache.sml	18 Feb 2008 15:52:40 -0000	1.76
***************
*** 915,918 ****
--- 915,929 ----
  		       write "\n"))
  
+ val () = Env.action_two "addIcon"
+ 	 ("icon", Env.string, "patterns", Env.list Env.string)
+ 	 (fn (icon, pats) =>
+ 	     case pats of
+ 		 [] => ()
+ 	       | _ => (write "\tAddIcon \"";
+ 		       write icon;
+ 		       write "\"";
+ 		       app (fn pat => (write " "; write pat)) pats;
+ 		       write "\n"))
+ 
  val () = Env.action_one "indexOptions"
  	 ("options", Env.list autoindex_option)
***************
*** 928,931 ****
--- 939,951 ----
  		       write "\n"))
  
+ val () = Env.action_one "indexIgnore"
+ 	 ("patterns", Env.list Env.string)
+ 	 (fn pats =>
+ 	     case pats of
+ 		 [] => ()
+ 	       | _ => (write "\tIndexIgnore";
+ 		       app (fn pat => (write " "; write pat)) pats;
+ 		       write "\n"))
+ 
  val () = Env.action_one "set_indexOptions"
  	 ("options", Env.list autoindex_option)

Update of /cvsroot/hcoop/domtool2/lib
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25112/lib

Modified Files:
	mod_autoindex.dtl 
Log Message:
Some more mod_autoindex directives

Index: mod_autoindex.dtl
===================================================================
RCS file: /cvsroot/hcoop/domtool2/lib/mod_autoindex.dtl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mod_autoindex.dtl	26 Aug 2006 22:36:55 -0000	1.1
--- mod_autoindex.dtl	18 Feb 2008 15:52:40 -0000	1.2
***************
*** 6,9 ****
--- 6,17 ----
    Apache documentation</a> for <tt>AddDescription</tt>.}}
  
+ extern val addIcon : location -> [no_spaces] -> [^Vhost];
+ {{See <a href="http://httpd.apache.org/docs/2.0/mod/mod_autoindex.html#addicon">the
+   Apache documentation</a> for <tt>AddIcon</tt>.}}
+ 
+ extern val indexIgnore : [no_spaces] -> [^Vhost];
+ {{See <a href="http://httpd.apache.org/docs/2.0/mod/mod_autoindex.html#indexignore">the
+   Apache documentation</a> for <tt>IndexIgnore</tt>.}}
+ 
  extern type autoindex_width;
  {{A setting for how wide some column should be}}

Update of /cvsroot/hcoop/domtool2/src/plugins
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16975/src/plugins

Modified Files:
	apache.sml 
Log Message:
Two mod_mime directives

Index: apache.sml
===================================================================
RCS file: /cvsroot/hcoop/domtool2/src/plugins/apache.sml,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** apache.sml	19 Jan 2008 20:25:55 -0000	1.74
--- apache.sml	18 Feb 2008 15:32:59 -0000	1.75
***************
*** 989,992 ****
--- 989,1014 ----
  			 write " .php .phtml\n"))
  
+ val () = Env.action_two "addType"
+ 	 ("mime type", Env.string, "extension", Env.string)
+ 	 (fn (mt, ext) => (write "\tAddType ";
+ 			   write mt;
+ 			   write " ";
+ 			   write ext;
+ 			   write "\n"))
+ 
+ val filter = fn (EVar "includes", _) => SOME "INCLUDES"
+ 	      | (EVar "deflate", _) => SOME "DEFLATE"
+ 	      | _ => NONE
+ 
+ val () = Env.action_two "addOutputFilter"
+ 	 ("filters", Env.list filter, "extensions", Env.list Env.string)
+ 	 (fn (f :: fs, exts as (_ :: _)) =>
+ 	     (write "\tAddOutputFilter ";
+ 	      write f;
+ 	      app (fn f => (write ";"; write f)) fs;
+ 	      app (fn ext => (write " "; write ext)) exts;
+ 	      write "\n")
+ 	   | _ => ())
+ 
  val () = Domain.registerResetLocal (fn () =>
  				       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))

Update of /cvsroot/hcoop/domtool2/lib
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16975/lib

Added Files:
	mod_mime.dtl 
Log Message:
Two mod_mime directives

--- NEW FILE: mod_mime.dtl ---
{{Support for Apache's mod_mime}}

extern val addType : no_spaces -> no_spaces -> [^Vhost];
{{See <a href="http://httpd.apache.org/docs/2.0/mod/mod_mime.html#addtype">the
  Apache documentation</a>.}}

extern type filter;
extern val includes : filter;
extern val deflate : filter;
extern val addOutputFilter : [filter] -> [no_spaces] -> [^Vhost];
{{See <a href="http://httpd.apache.org/docs/2.0/mod/mod_mime.html#addoutputfilter">the
  Apache documentation</a>.}}

Update of /cvsroot/hcoop/portal/mailman
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25449/mailman

Modified Files:
	portalsub.sml 
Log Message:
hcoop-help support

Index: portalsub.sml
===================================================================
RCS file: /cvsroot/hcoop/portal/mailman/portalsub.sml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** portalsub.sml	2 Jul 2006 17:11:16 -0000	1.3
--- portalsub.sml	16 Feb 2008 00:35:48 -0000	1.4
***************
*** 30,34 ****
      case CommandLine.arguments () of
  	[list, cmd, addr] =>
! 	if list <> "hcoop-discuss" andalso list <> "hcoop-misc" andalso list <> "hcoop-announce" andalso list <> "hcoop-sysadmin" then
  	    (print "Bad mailing list name\n";
  	     OS.Process.failure)
--- 30,35 ----
      case CommandLine.arguments () of
  	[list, cmd, addr] =>
! 	if list <> "hcoop-discuss" andalso list <> "hcoop-help" andalso list <> "hcoop-misc"
! 	   andalso list <> "hcoop-announce" andalso list <> "hcoop-sysadmin" then
  	    (print "Bad mailing list name\n";
  	     OS.Process.failure)

Update of /cvsroot/hcoop/portal
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25449

Modified Files:
	pref.mlt 
Log Message:
hcoop-help support

Index: pref.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/pref.mlt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pref.mlt	14 Dec 2007 00:23:47 -0000	1.8
--- pref.mlt	16 Feb 2008 00:35:47 -0000	1.9
***************
*** 26,29 ****
--- 26,36 ----
  	end;
  
+ 	if not (iff $"help" = "on" then
+ 			Pref.subscribe ("hcoop-help", youremail)
+ 		    else
+ 			Pref.unsubscribe ("hcoop-help", youremail)) then
+ 		%><h3>Error setting <tt>hcoop-help</tt> status</h3><%
+ 	end;
+ 
  	if not (iff $"misc" = "on" then
  			Pref.subscribe ("hcoop-misc", youremail)
***************
*** 54,57 ****
--- 61,65 ----
  <tr> <td><input type="checkbox" name="dir"<% if Pref.hasDirectory you then %> checked<% end %>></td> <td>Include me in the public member directory.</td> </tr>
  <tr> <td><input type="checkbox" name="discuss"<% if Pref.subscribed ("hcoop-discuss", youremail) then %> checked<% end %>></td> <td>Include me on the <tt>hcoop-discuss</tt> mailing list. <i>(On-topic discussion and sporadically high volume)</i></td> </tr>
+ <tr> <td><input type="checkbox" name="help"<% if Pref.subscribed ("hcoop-help", youremail) then %> checked<% end %>></td> <td>Include me on the <tt>hcoop-help</tt> mailing list. <i>(Members-helping-members support on how to use HCoop services)</i></td> </tr>
  <tr> <td><input type="checkbox" name="sysadmin"<% if Pref.subscribed ("hcoop-sysadmin", youremail) then %> checked<% end %>></td> <td>Include me on the <tt>hcoop-sysadmin</tt> mailing list. <i>(Discussion about technical adminstrative planning and related issues, not dealing directly with member support requests)</i></td> </tr>
  <tr> <td><input type="checkbox" name="misc"<% if Pref.subscribed ("hcoop-misc", youremail) then %> checked<% end %>></td> <td>Include me on the <tt>hcoop-misc</tt> mailing list. <i>(Off-topic)</i></td> </tr>

Update of /cvsroot/hcoop/domtool2/scripts
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20524/scripts

Modified Files:
	domtool-server domtool-slave 
Log Message:
init scripts: Fix bug with writing PID files

Index: domtool-slave
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-slave,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** domtool-slave	15 Feb 2008 04:19:36 -0000	1.4
--- domtool-slave	15 Feb 2008 04:35:18 -0000	1.5
***************
*** 1,8 ****
  #!/usr/bin/pagsh.openafs
  
! # This script should go in /etc/init.d/ on Debian Linux systems running Domtool slaves.
  
  SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
! PIDFILE="/var/run/k5start-domtool-slave.pid"
  
  set -e
--- 1,9 ----
  #!/usr/bin/pagsh.openafs
  
! # This script should go in /etc/init.d/ on Debian Linux systems
! # running Domtool slaves.
  
  SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
! PIDFILE="/var/run/domtool/k5start-slave.pid"
  
  set -e
***************
*** 14,17 ****
--- 15,24 ----
  		echo "...already running."
  	else
+ 		PIDDIR=$(dirname "$PIDFILE")
+ 		if test ! -d "$PIDDIR"; then
+ 			mkdir -m 0755 $PIDDIR
+ 			chown domtool:domtool $PIDDIR
+ 		fi
+ 
  		start-stop-daemon --start --pidfile $PIDFILE \
  			-c domtool:domtool \

Index: domtool-server
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-server,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** domtool-server	15 Feb 2008 04:19:36 -0000	1.5
--- domtool-server	15 Feb 2008 04:35:18 -0000	1.6
***************
*** 1,8 ****
  #!/usr/bin/pagsh.openafs
  
! # This script should go in /etc/init.d/ on Debian Linux systems running Domtool dispatchers.
  
  SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
! PIDFILE="/var/run/k5start-domtool-server.pid"
  
  set -e
--- 1,9 ----
  #!/usr/bin/pagsh.openafs
  
! # This script should go in /etc/init.d/ on Debian Linux systems
! # running Domtool dispatchers.
  
  SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
! PIDFILE="/var/run/domtool/k5start-server.pid"
  
  set -e
***************
*** 14,17 ****
--- 15,24 ----
  		echo "...already running."
  	else
+ 		PIDDIR=$(dirname "$PIDFILE")
+ 		if test ! -d "$PIDDIR"; then
+ 			mkdir -m 0755 $PIDDIR
+ 			chown domtool:domtool $PIDDIR
+ 		fi
+ 
  		start-stop-daemon --start --pidfile $PIDFILE \
  			-c domtool:domtool \

Update of /cvsroot/hcoop/domtool2/scripts
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14358/scripts

Modified Files:
	domtool-server domtool-slave 
Log Message:
init scripts: Don't error out when stopping in restart action

Index: domtool-slave
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-slave,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** domtool-slave	17 Nov 2007 16:10:48 -0000	1.3
--- domtool-slave	15 Feb 2008 04:19:36 -0000	1.4
***************
*** 36,40 ****
  
    restart|reload|force-reload)
! 	$SELF stop
  	$SELF start
  	;;
--- 36,40 ----
  
    restart|reload|force-reload)
! 	set +e; $SELF stop; set -e
  	$SELF start
  	;;

Index: domtool-server
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-server,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** domtool-server	17 Nov 2007 16:10:48 -0000	1.4
--- domtool-server	15 Feb 2008 04:19:36 -0000	1.5
***************
*** 36,40 ****
  
    restart|reload|force-reload)
! 	$SELF stop
  	$SELF start
  	;;
--- 36,40 ----
  
    restart|reload|force-reload)
! 	set +e; $SELF stop; set -e
  	$SELF start
  	;;

Update of /cvsroot/hcoop/domtool2/scripts
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26722

Modified Files:
	domtool-addacl domtool-addcert domtool-addcert-daemon 
	domtool-rmuser 
Log Message:

* Safer handling of $1 in all scripts
* Replaced `echo ~$USER` trick with our standard $PATHBITS implementation



Index: domtool-addcert-daemon
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-addcert-daemon,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** domtool-addcert-daemon	16 Jun 2007 20:32:36 -0000	1.1
--- domtool-addcert-daemon	15 Feb 2008 02:03:30 -0000	1.2
***************
*** 1,7 ****
  #!/bin/sh -e
  
!   KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$1
   KEYFILE=$KEYDIR/key.pem
! CERTFILE=/afs/hcoop.net/common/etc/domtool/certs/$1.pem
    NEWREQ=~/.newreq.pem
       NEW=~/.new.pem
--- 1,13 ----
  #!/bin/sh -e
  
! USER="$1"
! if test -z "$USER"; then
!         echo Usage: domtool-addcert USERNAME
!         exit 1
! fi
! 
!   KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$USER
   KEYFILE=$KEYDIR/key.pem
! CERTFILE=/afs/hcoop.net/common/etc/domtool/certs/$USER.pem
    NEWREQ=~/.newreq.pem
       NEW=~/.new.pem
***************
*** 16,21 ****
  echo "." >>$KEYIN
  echo "." >>$KEYIN
! echo "$1" >>$KEYIN
! echo "$1...@hc..." >>$KEYIN
  echo "" >>$KEYIN
  echo "" >>$KEYIN
--- 22,27 ----
  echo "." >>$KEYIN
  echo "." >>$KEYIN
! echo "$USER" >>$KEYIN
! echo "$US...@hc..." >>$KEYIN
  echo "" >>$KEYIN
  echo "" >>$KEYIN

Index: domtool-addacl
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-addacl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** domtool-addacl	8 May 2007 20:30:00 -0000	1.4
--- domtool-addacl	15 Feb 2008 02:03:30 -0000	1.5
***************
*** 1,7 ****
  #!/bin/sh -e
  
! domtool-admin grant $1 user $1
! domtool-admin grant $1 path `sh -c "echo ~$1"`
  
  # disabled since we want to discourage the use of unix groups
! #domtool-admin grant $1 group $1
\ No newline at end of file
--- 1,16 ----
  #!/bin/sh -e
  
! USER="$1"
! if test -z "$USER"; then
! 	echo Usage: domtool-addacl USERNAME
! 	exit 1
! fi
! 
! PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER
! HOMEPATH=/afs/hcoop.net/user/$PATHBITS
! 
! domtool-admin grant $USER user $USER
! domtool-admin grant $USER path $HOMEPATH
  
  # disabled since we want to discourage the use of unix groups
! #domtool-admin grant $USER group $USER

Index: domtool-rmuser
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-rmuser,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** domtool-rmuser	16 Dec 2006 19:58:52 -0000	1.1
--- domtool-rmuser	15 Feb 2008 02:03:31 -0000	1.2
***************
*** 1,5 ****
  #!/bin/sh -e
  
! rm -rf /afs/hcoop.net/common/etc/domtool/keys/$1
! rm /afs/hcoop.net/common/etc/domtool/certs/$1.pem
! domtool-admin rmuser $1
--- 1,12 ----
  #!/bin/sh -e
  
! USER="$1"
! 
! if test -z "$USER"; then
! 	echo Usage: domtool-rmuser USERNAME
! 	exit 1
! fi
! 
! rm -rf /afs/hcoop.net/common/etc/domtool/keys/$USER
! rm /afs/hcoop.net/common/etc/domtool/certs/$USER.pem
! domtool-admin rmuser $USER

Index: domtool-addcert
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-addcert,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** domtool-addcert	17 Nov 2007 01:17:12 -0000	1.2
--- domtool-addcert	15 Feb 2008 02:03:30 -0000	1.3
***************
*** 1,4 ****
--- 1,10 ----
  #!/bin/sh -e
  
+ USER="$1"
+ if test -z "$USER"; then
+ 	echo Usage: domtool-addcert USERNAME
+ 	exit 1
+ fi   
+ 
    KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$1
   KEYFILE=$KEYDIR/key.pem
***************
*** 11,15 ****
  openssl genrsa -out $KEYFILE
  chown -R domtool.domtool $KEYDIR
! fs sa $KEYDIR $1 read
  echo "." >$KEYIN
  echo "." >>$KEYIN
--- 17,21 ----
  openssl genrsa -out $KEYFILE
  chown -R domtool.domtool $KEYDIR
! fs sa $KEYDIR $USER read
  echo "." >$KEYIN
  echo "." >>$KEYIN
***************
*** 17,22 ****
  echo "." >>$KEYIN
  echo "." >>$KEYIN
! echo "$1" >>$KEYIN
! echo "$1...@hc..." >>$KEYIN
  echo "" >>$KEYIN
  echo "" >>$KEYIN
--- 23,28 ----
  echo "." >>$KEYIN
  echo "." >>$KEYIN
! echo "$USER" >>$KEYIN
! echo "$US...@hc..." >>$KEYIN
  echo "" >>$KEYIN
  echo "" >>$KEYIN

Update of /cvsroot/hcoop/portal
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25418

Modified Files:
	poll.mlt 
Log Message:
List open polls on polls page

Index: poll.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/poll.mlt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** poll.mlt	2 Jul 2006 17:11:16 -0000	1.8
--- poll.mlt	24 Jan 2008 23:09:10 -0000	1.9
***************
*** 314,320 ****
  <% end %>
  <%	| NONE =>
! if showNormal then %>
  
! <a href="poll?cmd=list">Show all polls</a><br>
  
  <h3>Create a poll</h3>
--- 314,332 ----
  <% end %>
  <%	| NONE =>
! if showNormal then
  
! val polls = Poll.listCurrentPolls ();
! switch polls of
! 	_::_ => %>
! <h3><a href="poll">Current polls</a></h3>
! 
! <% foreach pol in polls do %>
! <li> <a href="poll?id=<% #id pol %>"><% Web.html (#title pol) %></a>
! <% if Poll.takingVotes pol then %><a href="poll?vote=<% #id pol %>">[VOTE]</a><% end %>
! (<% Web.html (#starts pol) %> to <% Web.html (#ends pol) %>)</li>
! <% end
! end %>
! 
! <p><a href="poll?cmd=list">Show all polls</a></p>
  
  <h3>Create a poll</h3>

Update of /cvsroot/hcoop/portal/contact
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23084

Modified Files:
	contact.sml 
Log Message:
Make mass-mailto link use Bcc

Index: contact.sml
===================================================================
RCS file: /cvsroot/hcoop/portal/contact/contact.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** contact.sml	19 Jan 2008 21:30:39 -0000	1.1
--- contact.sml	19 Jan 2008 21:36:25 -0000	1.2
***************
*** 64,68 ****
  	print "<html><head><title>HCoop Emergency Contact Information</title></head><body><h1>HCoop Emergency Contact Information</h1>\n";
  
! 	print "<h2><a href=\"mailto:";
  	print (String.concatWith "," (allEmails ()));
  	print "\">E-mail everyone (off-HCoop addresses)</a></h2>\n\n";
--- 64,68 ----
  	print "<html><head><title>HCoop Emergency Contact Information</title></head><body><h1>HCoop Emergency Contact Information</h1>\n";
  
! 	print "<h2><a href=\"mailto:?Bcc=";
  	print (String.concatWith "," (allEmails ()));
  	print "\">E-mail everyone (off-HCoop addresses)</a></h2>\n\n";

Update of /cvsroot/hcoop/portal/contact
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20698/contact

Added Files:
	.cvsignore Makefile contact.sh contact.sig contact.sml 
	sources.cm 
Log Message:
Contact info dumper

--- NEW FILE: .cvsignore ---
.cm
*.x86-linux

--- NEW FILE: contact.sml ---
structure Contact :> CONTACT =
struct

structure C = PgClient

fun main _ =
    let
	val db = C.conn "dbname='hcoop_hcoop'"

	fun allEmails () =
	    let
		fun s [v] = C.stringFromSql v
		  | s _ = raise Fail "Bad allEmails row"
	    in
		C.map db s
		      "SELECT v FROM Contact JOIN ContactKind ON knd = ContactKind.id AND ContactKind.name = 'Non-hcoop e-mail' ORDER BY v"
	    end

	fun kindRow [id, name, url, urlPrefix, urlPostfix] =
	    {id = C.intFromSql id,
	     name = C.stringFromSql name,
	     url = if C.boolFromSql url then
		       SOME (C.stringFromSql urlPrefix,
			     C.stringFromSql urlPostfix)
		   else
		       NONE}
	  | kindRow _ = raise Fail "Bad ContactKind row"

	val kinds = C.map db kindRow "SELECT id, name, url, urlPrefix, urlPostfix FROM ContactKind ORDER BY name"

	fun doOne (kind : {id : int, name : string, url : (string * string) option}) =
	    let
		fun doOne [name, v] =
		    let
			val name = C.stringFromSql name
			val v = C.stringFromSql v
		    in
			print "<li> ";
			print (Web.html name);
			print ": ";
			case #url kind of
			    NONE => print (Web.html v)
			  | SOME (pre, post) =>
			    (print "<a href=\"";
			     print (Web.html (pre ^ v ^ post));
			     print "\">";
			     print (Web.html v);
			     print "</a>");
			print "</li>\n"
		    end
		  | doOne _ = raise Fail "Bad Contact row"
	    in
		print "<h2>";
		print (#name kind);
		print "</h2>\n<ol>\n";

		C.app db doOne ("SELECT name, v FROM Contact JOIN WebUserActive ON usr = WebUserActive.id"
				^ " WHERE knd = " ^ C.intToSql (#id kind)
				^ " ORDER BY name, v");

		print "</ol>\n\n"
	    end
    in
	print "<html><head><title>HCoop Emergency Contact Information</title></head><body><h1>HCoop Emergency Contact Information</h1>\n";

	print "<h2><a href=\"mailto:";
	print (String.concatWith "," (allEmails ()));
	print "\">E-mail everyone (off-HCoop addresses)</a></h2>\n\n";

	app doOne kinds;
	print "</body></html>\n";
	C.close db;
	OS.Process.success
    end handle C.Sql s => (print ("SQL failure: " ^ s ^ "\n");
			   OS.Process.failure)

end

--- NEW FILE: Makefile ---
SMLBIN=/usr/local/sml/bin

all:
	$(SMLBIN)/ml-build sources.cm Contact.main contact

--- NEW FILE: contact.sh ---
/usr/local/sml/bin/sml @SMLload=/afs/hcoop.net/user/h/hc/hcoop/portal/contact/contact.x86-linux

--- NEW FILE: sources.cm ---
Group is
	$/basis.cm
	$/smlnj-lib.cm
	/usr/local/share/smlsql/smlsql.cm
	/usr/local/share/smlsql/libpq/sources.cm
	/usr/local/share/mlt/src/lib/sources.cm

	contact.sig
	contact.sml

--- NEW FILE: contact.sig ---
signature CONTACT =
sig
    val main : string * string list -> OS.Process.status
end

Update of /cvsroot/hcoop/portal/contact
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20249/contact

Log Message:
Directory /cvsroot/hcoop/portal/contact added to the repository

Update of /cvsroot/hcoop/portal
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7815

Modified Files:
	apps.mlt apt.mlt cert.mlt domain.mlt ip.mlt list.mlt quota.mlt 
	sec.mlt util.sig util.sml 
Log Message:
Mark pending requests with how long ago they were submitted

Index: apt.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/apt.mlt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** apt.mlt	15 Oct 2007 23:59:54 -0000	1.6
--- apt.mlt	19 Jan 2008 20:57:32 -0000	1.7
***************
*** 77,81 ****
  <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>Node:</td> <td colspan="2"><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Packages:</td><%
--- 77,81 ----
  <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 %> (<% 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><%
***************
*** 119,123 ****
  <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>Node:</td> <td colspan="2"><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Packages:</td><%
--- 119,123 ----
  <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 %> (<% 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><%
***************
*** 164,168 ****
  <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>Node:</td> <td><select name="node">
  <% foreach node in Init.listNodes () do %>
--- 164,168 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Node:</td> <td><select name="node">
  <% foreach node in Init.listNodes () do %>

Index: util.sml
===================================================================
RCS file: /cvsroot/hcoop/portal/util.sml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** util.sml	8 Dec 2007 22:36:51 -0000	1.15
--- util.sml	19 Jan 2008 20:57:32 -0000	1.16
***************
*** 88,90 ****
--- 88,108 ----
  		    | [] => ""
  
+ val s_cutoff = LargeInt.fromInt 60
+ val m_cutoff = LargeInt.fromInt (60 * 60)
+ val h_cutoff = LargeInt.fromInt (60 * 60 * 24)
+ 
+ fun diffFromNow t =
+     let
+ 	val secs = Time.toSeconds (Time.- (Time.now (), t))
+     in
+ 	if LargeInt.< (secs, s_cutoff) then
+ 	    LargeInt.toString secs ^ " seconds"
+ 	else if LargeInt.< (secs, m_cutoff) then
+ 	    LargeInt.toString (LargeInt.div (secs, s_cutoff)) ^ " minutes"
+ 	else if LargeInt.< (secs, h_cutoff) then
+ 	    LargeInt.toString (LargeInt.div (secs, m_cutoff)) ^ " hours"
+ 	else
+ 	    LargeInt.toString (LargeInt.div (secs, h_cutoff)) ^ " days"
+     end
+ 
  end

Index: sec.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/sec.mlt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sec.mlt	15 Dec 2007 20:43:09 -0000	1.11
--- sec.mlt	19 Jan 2008 20:57:32 -0000	1.12
***************
*** 133,137 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>Node:</td> <td><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Request:</td> <td><% #data req %></td> </tr>
--- 133,137 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td></tr>
  <tr> <td>Node:</td> <td><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Request:</td> <td><% #data req %></td> </tr>
***************
*** 154,158 ****
  <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>Node:</td> <td><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Request:</td> <td><% #data req %></td> </tr>
--- 154,158 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td></tr>
  <tr> <td>Node:</td> <td><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Request:</td> <td><% #data req %></td> </tr>
***************
*** 178,182 ****
  <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>Status:</td> <td><select name="status">
  	<option value="0"<% if #status req = Sec.Req.NEW then %> selected<% end %>>New</option>
--- 178,182 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td></tr>
  <tr> <td>Status:</td> <td><select name="status">
  	<option value="0"<% if #status req = Sec.Req.NEW then %> selected<% end %>>New</option>

Index: ip.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/ip.mlt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ip.mlt	11 Nov 2007 20:34:39 -0000	1.2
--- ip.mlt	19 Jan 2008 20:57:32 -0000	1.3
***************
*** 29,33 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>Node:</td> <td><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Port:</td> <td><% #data req %></td> </tr>
--- 29,33 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Node:</td> <td><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Port:</td> <td><% #data req %></td> </tr>
***************
*** 51,55 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>Node:</td> <td><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Port:</td> <td><% #data req %></td> </tr>
--- 51,55 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Node:</td> <td><% Web.html (Init.nodeName (#node req)) %></td> </tr>
  <tr> <td>Port:</td> <td><% #data req %></td> </tr>
***************
*** 76,80 ****
  <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>Node:</td> <td><select name="node">
  <% foreach node in Init.listNodes () do %>
--- 76,80 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Node:</td> <td><select name="node">
  <% foreach node in Init.listNodes () do %>

Index: cert.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/cert.mlt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cert.mlt	15 Dec 2007 17:19:30 -0000	1.6
--- cert.mlt	19 Jan 2008 20:57:32 -0000	1.7
***************
*** 45,49 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>Request:</td> <td><% #data req %></td> </tr>
  <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
--- 45,49 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Request:</td> <td><% #data req %></td> </tr>
  <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
***************
*** 66,70 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>Request:</td> <td><% #data req %></td> </tr>
  <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
--- 66,70 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Request:</td> <td><% #data req %></td> </tr>
  <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
***************
*** 90,94 ****
  <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>Status:</td> <td><select name="status">
  	<option value="0"<% if #status req = Cert.NEW then %> selected<% end %>>New</option>
--- 90,94 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Status:</td> <td><select name="status">
  	<option value="0"<% if #status req = Cert.NEW then %> selected<% end %>>New</option>

Index: domain.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/domain.mlt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** domain.mlt	1 Jan 2008 21:44:45 -0000	1.6
--- domain.mlt	19 Jan 2008 20:57:32 -0000	1.7
***************
*** 28,32 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>Domain:</td> <td><a href="<% Util.whoisUrl (#data req) %>"><% #data req %></a></td> </tr>
  <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
--- 28,32 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Domain:</td> <td><a href="<% Util.whoisUrl (#data req) %>"><% #data req %></a></td> </tr>
  <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
***************
*** 49,53 ****
  <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>Domain:</td> <td><a href="<% Util.whoisUrl (#data req) %>"><% #data req %></a></td> </tr>
  <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
--- 49,53 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Domain:</td> <td><a href="<% Util.whoisUrl (#data req) %>"><% #data req %></a></td> </tr>
  <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
***************
*** 73,77 ****
  <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>Status</b>:</td> <td><select name="status">
  	<option value="0"<% if #status req = Domain.NEW then %> selected<% end %>>New</option>
--- 73,77 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Status</b>:</td> <td><select name="status">
  	<option value="0"<% if #status req = Domain.NEW then %> selected<% end %>>New</option>

Index: apps.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/apps.mlt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** apps.mlt	19 Jan 2008 20:36:23 -0000	1.14
--- apps.mlt	19 Jan 2008 20:57:32 -0000	1.15
***************
*** 14,18 ****
  
  	<table class="blanks">
! 	<tr> <td>Received:</td> <td><% #applied appl %></td> </tr>
  	<tr> <td>Approved by:</td> <td><%
  		ref first = true;
--- 14,18 ----
  
  	<table class="blanks">
! 	<tr> <td>Received:</td> <td><% #applied appl %> (<% Util.diffFromNow (#applied appl) %> ago)</td> </tr>
  	<tr> <td>Approved by:</td> <td><%
  		ref first = true;
***************
*** 87,91 ****
  		<br><hr><br>
  		<table class="blanks">
! 		<tr> <td>Received:</td> <td><% #applied appl %></td> </tr>
  		<tr> <td>Approved by:</td> <td><%
  			ref first = true;
--- 87,91 ----
  		<br><hr><br>
  		<table class="blanks">
! 		<tr> <td>Received:</td> <td><% #applied appl %> (<% Util.diffFromNow (#applied appl) %> ago)</td> </tr>
  		<tr> <td>Approved by:</td> <td><%
  			ref first = true;
***************
*** 164,168 ****
  	<br><hr><br>
  	<table class="blanks">
! 	<tr> <td>Received:</td> <td><% #applied appl %></td> </tr>
  	<tr> <td>Approved by:</td> <td><%
  		ref first = true;
--- 164,168 ----
  	<br><hr><br>
  	<table class="blanks">
! 	<tr> <td>Received:</td> <td><% #applied appl %> (<% Util.diffFromNow (#applied appl) %> ago)</td></tr>
  	<tr> <td>Approved by:</td> <td><%
  		ref first = true;
***************
*** 199,203 ****
  	<a href="apps?deny=<% #id appl %>">Deny this application.</a>
  	<% end %>
! <% end
  end %>
  
--- 199,203 ----
  	<a href="apps?deny=<% #id appl %>">Deny this application.</a>
  	<% end %>
! <% end 
  end %>
  

Index: util.sig
===================================================================
RCS file: /cvsroot/hcoop/portal/util.sig,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** util.sig	22 Nov 2007 21:12:48 -0000	1.12
--- util.sig	19 Jan 2008 20:57:32 -0000	1.13
***************
*** 33,35 ****
--- 33,37 ----
      val allLower : string -> string
      val normEmail : string -> string
+ 
+     val diffFromNow : Time.time -> string
  end

Index: quota.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/quota.mlt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** quota.mlt	29 Dec 2007 21:28:34 -0000	1.3
--- quota.mlt	19 Jan 2008 20:57:32 -0000	1.4
***************
*** 52,56 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>Request:</td> <td><% Web.htmlNl (#data req) %></td> </tr>
  <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
--- 52,56 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Request:</td> <td><% Web.htmlNl (#data req) %></td> </tr>
  <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
***************
*** 72,76 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>Request:</td> <td><% Web.htmlNl (#data req) %></td> </tr>
  <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
--- 72,76 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Request:</td> <td><% Web.htmlNl (#data req) %></td> </tr>
  <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
***************
*** 96,100 ****
  <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>Status:</td> <td><select name="status">
  	<option value="0"<% if #status req = Quota.NEW then %> selected<% end %>>New</option>
--- 96,100 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Status:</td> <td><select name="status">
  	<option value="0"<% if #status req = Quota.NEW then %> selected<% end %>>New</option>

Index: list.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/list.mlt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** list.mlt	15 Dec 2007 17:19:30 -0000	1.11
--- list.mlt	19 Jan 2008 20:57:32 -0000	1.12
***************
*** 23,27 ****
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
  <tr> <td>List name:</td> <td><% #data req %></td> </tr>
  <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
--- 23,27 ----
  <table class="blanks">
  <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
! <tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>List name:</td> <td><% #data req %></td> </tr>
  <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
***************
*** 45,49 ****
  <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>List name:</td> <td><% #data req %></td> </tr>
  <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
--- 45,49 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>List name:</td> <td><% #data req %></td> </tr>
  <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
***************
*** 69,73 ****
  <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>Status:</td> <td><select name="status">
  	<option value="0"<% if #status req = MailingList.NEW then %> selected<% end %>>New</option>
--- 69,73 ----
  <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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
  <tr> <td>Status:</td> <td><select name="status">
  	<option value="0"<% if #status req = MailingList.NEW then %> selected<% end %>>New</option>

Update of /cvsroot/hcoop/portal
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32044

Modified Files:
	apps.mlt group.sig group.sml 
Log Message:
Member of root group who aren't board members may not vote on applicants

Index: group.sig
===================================================================
RCS file: /cvsroot/hcoop/portal/group.sig,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** group.sig	14 Apr 2005 19:19:37 -0000	1.1.1.1
--- group.sig	19 Jan 2008 20:36:23 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
      val userInGroupNum : int * int -> bool
      val userInGroupName : int * string -> bool
+     val userReallyInGroupName : int * string -> bool (* Doesn't count root group *)
  
      val addToGroup : membership -> unit
***************
*** 23,29 ****
      val inGroupNum : int -> bool
      val inGroupName : string -> bool
  
      (* These raise Access if the check fails *)
      val requireGroupNum : int -> unit
      val requireGroupName : string -> unit
! end
\ No newline at end of file
--- 24,31 ----
      val inGroupNum : int -> bool
      val inGroupName : string -> bool
+     val reallyInGroupName : string -> bool
  
      (* These raise Access if the check fails *)
      val requireGroupNum : int -> unit
      val requireGroupName : string -> unit
! end

Index: group.sml
===================================================================
RCS file: /cvsroot/hcoop/portal/group.sml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** group.sml	22 Nov 2007 19:24:00 -0000	1.9
--- group.sml	19 Jan 2008 20:36:23 -0000	1.10
***************
*** 74,77 ****
--- 74,89 ----
      end
  
+ fun userReallyInGroupName (usr, grp) =
+     let
+ 	val c = getDb ()
+     in
+ 	(case C.oneOrNoRows c ($`SELECT COUNT( * )
+ 				    FROM Membership, WebGroup
+ 				    WHERE (name = ^(C.stringToSql grp) AND grp = id)
+ 				       AND usr = ^(C.intToSql usr)`) of
+ 	     SOME[x] => not (C.isNull x) andalso C.intFromSql x <> 0
+ 	   | _ => false)
+     end
+ 
  
  (* Managing group memberships *)
***************
*** 119,122 ****
--- 131,135 ----
  fun inGroupNum grp = userInGroupNum (getUserId(), grp)
  fun inGroupName grp = userInGroupName (getUserId(), grp)
+ fun reallyInGroupName grp = userReallyInGroupName (getUserId(), grp)
  
  fun requireGroupNum grp =

Index: apps.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/apps.mlt,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** apps.mlt	8 Dec 2007 21:00:07 -0000	1.13
--- apps.mlt	19 Jan 2008 20:36:23 -0000	1.14
***************
*** 2,6 ****
  
  val you = Init.getUserId ();
! val board = Group.inGroupName "board";
  val root = Group.inGroupNum 0;
  
--- 2,6 ----
  
  val you = Init.getUserId ();
! val board = Group.reallyInGroupName "board";
  val root = Group.inGroupNum 0;
  

Update of /cvsroot/hcoop/domtool2/lib
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27701/lib

Added Files:
	php.dtl 
Log Message:
phpVersion

--- NEW FILE: php.dtl ---
{{PHP configuration}}

extern type php_version;
extern val php4 : php_version;
extern val php5 : php_version;

extern val phpVersion : php_version -> [^Vhost];

Update of /cvsroot/hcoop/domtool2/src/plugins
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27701/src/plugins

Modified Files:
	apache.sml 
Log Message:
phpVersion

Index: apache.sml
===================================================================
RCS file: /cvsroot/hcoop/domtool2/src/plugins/apache.sml,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** apache.sml	16 Dec 2007 23:11:41 -0000	1.73
--- apache.sml	19 Jan 2008 20:25:55 -0000	1.74
***************
*** 978,982 ****
  		      write path;
  		      write "\"\n"))
! 	 
  val () = Domain.registerResetLocal (fn () =>
  				       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))
--- 978,992 ----
  		      write path;
  		      write "\"\n"))
! 
! val php_version = fn (EVar "php4", _) => SOME 4
! 		   | (EVar "php5", _) => SOME 5
! 		   | _ => NONE
! 
! val () = Env.action_one "phpVersion"
! 	 ("version", php_version)
! 	 (fn version => (write "\tAddHandler x-httpd-php";
! 			 write (Int.toString version);
! 			 write " .php .phtml\n"))
! 
  val () = Domain.registerResetLocal (fn () =>
  				       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))

Update of /cvsroot/hcoop/domtool2/src
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24600/src

Modified Files:
	domain.sml 
Log Message:
Increase length limits on domains

Index: domain.sml
===================================================================
RCS file: /cvsroot/hcoop/domtool2/src/domain.sml,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** domain.sml	20 Dec 2007 13:37:33 -0000	1.63
--- domain.sml	19 Jan 2008 20:17:27 -0000	1.64
***************
*** 114,122 ****
  
  fun validHost s =
!     size s > 0 andalso size s < 20
      andalso CharVector.all (fn ch => isIdent ch orelse ch = #"-") s
  
  fun validDomain s =
!     size s > 0 andalso size s < 100
      andalso List.all validHost (String.fields (fn ch => ch = #".") s)
  
--- 114,122 ----
  
  fun validHost s =
!     size s > 0 andalso size s < 50
      andalso CharVector.all (fn ch => isIdent ch orelse ch = #"-") s
  
  fun validDomain s =
!     size s > 0 andalso size s < 200
      andalso List.all validHost (String.fields (fn ch => ch = #".") s)
  

Update of /cvsroot/hcoop/misc/scripts
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24472/scripts

Modified Files:
	hcoop-backup 
Log Message:
hcoop-backup: Deal with /usr/bin/*.notslocate files.


Index: hcoop-backup
===================================================================
RCS file: /cvsroot/hcoop/misc/scripts/hcoop-backup,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** hcoop-backup	15 Jan 2008 00:07:10 -0000	1.9
--- hcoop-backup	15 Jan 2008 00:08:06 -0000	1.10
***************
*** 60,63 ****
--- 60,64 ----
   grep -v '^/usr/.*\.elc' | \
   grep -v '^/usr/bin/perldoc\.stub$' | \
+  grep -v '^/usr/bin/.*\.notslocate$' | \
   grep -v '^/usr/lib/courier/.*\.rand$' | \
   grep -v '^/usr/lib/gconv/gconv-modules\.cache$' | \

Update of /cvsroot/hcoop/misc/scripts
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24087/scripts

Modified Files:
	hcoop-backup 
Added Files:
	hcoop-backup-wrapper 
Log Message:
Sync hcoop-backup changes from megacz


--- NEW FILE: hcoop-backup-wrapper ---
#!/bin/bash

exec >& /var/log/backup-to-megacz.com-wrapper-log
touch /xyz/zys   # generate an error message

fs checks -cell megacz.com
fs checkvol
rm -f /var/log/backup-to-megacz.com-log
echo "groups before k5start" > /var/log/backup-to-megacz.com-log
groups >> /var/log/backup-to-megacz.com-log
export KINIT_PROG='aklog -c hcoop.net;aklog -c megacz.com'
exec k5start -f /etc/keytabs/hcoop hc...@HC... -t \
    /afs/hcoop.net/common/etc/scripts/hcoop-backup

Index: hcoop-backup
===================================================================
RCS file: /cvsroot/hcoop/misc/scripts/hcoop-backup,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** hcoop-backup	27 Dec 2007 04:17:24 -0000	1.8
--- hcoop-backup	15 Jan 2008 00:07:10 -0000	1.9
***************
*** 2,17 ****
  
  #
! # run this script as root, on deleuze, in a directory that WILL NOT be
! # part of the backup (/tmp is a good choice).
  #
  
! # FIXME:
! # postgres dumps
! # mysql dumps
  
! #umask 0644
  
! # for catsync
! #PATH=$PATH:/home/megacz_admin/
  #COMPRESS_EXT=.bz2
  #COMPRESS_PROG=bzip2
--- 2,15 ----
  
  #
! # it is dangerous to remove the "-e" above; please don't do that.
  #
  
! #
! # run this script as root, on deleuze
! #
  
! exec >& /var/log/backup-to-megacz.com-log
  
! PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
  #COMPRESS_EXT=.bz2
  #COMPRESS_PROG=bzip2
***************
*** 19,28 ****
  COMPRESS_PROG=gzip
  
! #KEYFILE=$1
  KEYFILE=/etc/backup-encryption-key
! BACKUPDIR=/afs/megacz.com/hcoop-backup/
  
  cd $BACKUPDIR
! find * -prune -ctime +2 -exec rm -rf {} \;
  
  SUBDIR=`date +%Y.%m.%d`
--- 17,27 ----
  COMPRESS_PROG=gzip
  
! IFS=$'\n'
! 
  KEYFILE=/etc/backup-encryption-key
! BACKUPDIR=/afs/megacz.com/private/hcoop-backup/
  
  cd $BACKUPDIR
! find * -prune -ctime +1 -exec rm -rf {} \; || true
  
  SUBDIR=`date +%Y.%m.%d`
***************
*** 31,34 ****
--- 30,34 ----
  cd $SUBDIR
  
+ groups
  echo 'I am in:'
  pwd
***************
*** 37,41 ****
  echo building package lists...
  dpkg-query -W -f='${Package}\n' > packages
! (cd /; sudo find / /usr/ /usr/local/ /var/ -xdev)   | sort | uniq > allfiles
  dpkg-query -W -f='${Package}\n'      | xargs dpkg -L | sort | uniq > debfiles
  dpkg-query -W -f='${Conffiles}\n'           | grep / | cut -b2- | sed 's_ .*__' | sort | uniq > conffiles
--- 37,41 ----
  echo building package lists...
  dpkg-query -W -f='${Package}\n' > packages
! (cd /; find / /usr/ /usr/local/ /var/ -xdev)   | sort | uniq > allfiles
  dpkg-query -W -f='${Package}\n'      | xargs dpkg -L | sort | uniq > debfiles
  dpkg-query -W -f='${Conffiles}\n'           | grep / | cut -b2- | sed 's_ .*__' | sort | uniq > conffiles
***************
*** 86,103 ****
   grep -v ^/vmlinuz.old | \
   grep -v '^/sbin/[a-z\-]*\.modutils$' | \
-  cat > annoyingfiles-
- 
- OLDIFS=$IFS
- IFS="
- "
- 
- for A in `cat annoyingfiles-`
- do \
-   test -L "$A" || echo "$A"
- done > annoyingfiles
- 
- IFS=$OLDIFS
- 
- cat annoyingfiles | \
   grep -v ^/opt/dell/srvadmin/ | \
   grep -v ^/boot/ | \
--- 86,89 ----
***************
*** 111,127 ****
   grep -v ^/var/lib/postgres/ | \
   grep -v ^/var/lib/postgresql/ | \
   cat > complain
  
! grep '[a-z/]' complain && \
!   mail -a 'From: Adam Megacz <me...@hc...>' \
!        -s "automated message: annoying files found on deleuze (please do something about them)" ad...@hc... \
!        < complain
! 
! cp backupfiles /tmp/backupfiles
! (cd /; sudo tar cvlpf - --ignore-failed-read --no-recursion -C / -T /tmp/backupfiles) | \
    $COMPRESS_PROG | \
    ccrypt -k $KEYFILE -e | \
    catsync hcoop.backup.tar$COMPRESS_EXT.aescrypt
- du -chs hcoop.backup.tar$COMPRESS_EXT.aescrypt
  
  vos listvol deleuze | \
--- 97,107 ----
   grep -v ^/var/lib/postgres/ | \
   grep -v ^/var/lib/postgresql/ | \
+  xargs -I{} -d\\n -- bash -c "test -L '{}' || echo '{}'" | \
   cat > complain
  
! tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
    $COMPRESS_PROG | \
    ccrypt -k $KEYFILE -e | \
    catsync hcoop.backup.tar$COMPRESS_EXT.aescrypt
  
  vos listvol deleuze | \
***************
*** 131,158 ****
    grep -v "\.backup .*$" | \
    grep -v "\.readonly .*$" | \
    cat > volumes
  
! echo volume list:
! cat volumes | grep -v not-backed-up
! 
! IFS="
! "
  
! for A in `cat volumes | grep -v not-backed-up`
! do \
!   echo "dumping afs volume $A..."
!   vos dump -id $A -localauth -clone | \
!        $COMPRESS_PROG | \
!        ccrypt -k $KEYFILE -e | \
!        catsync $A.dump$COMPRESS_EXT.aescrypt
!   echo "  finished dumping afs volume $A."
! done
  
! # for some reason this has been causing the backups to abort...
! #echo backing up databases
! #tar -C /var/backups/databases/ -cf - . | \
! #  $COMPRESS_PROG | \
! #  ccrypt -k $KEYFILE -e \
! #  | catsync databases.tar$COMPRESS_EXT.aescrypt
  
  echo done
--- 111,136 ----
    grep -v "\.backup .*$" | \
    grep -v "\.readonly .*$" | \
+   sed 's_^ .*__' | \
+   sed 's_ .*$__' | \
+   grep '[A-Za-z]' | \
    cat > volumes
  
! cat volumes | \
!   grep -v not-backed-up | \
!   xargs -I{} -d\\n -- \
!   bash -c \
!     "vos dump -id {} -localauth -clone | $COMPRESS_PROG | ccrypt -k $KEYFILE -e | catsync {}.dump$COMPRESS_EXT.aescrypt"
  
! echo backing up databases
! tar -C /var/backups/databases/ -cf - . | \
!   $COMPRESS_PROG | \
!   ccrypt -k $KEYFILE -e \
!   | catsync databases.tar$COMPRESS_EXT.aescrypt
  
! grep '[a-z/]' complain && \
!   mail -a 'From: Adam Megacz <me...@hc...>' \
!        -s "automated message: annoying files found on deleuze (please do something about them)" ad...@hc... \
!        < complain \
!   || true
  
  echo done

Update of /cvsroot/hcoop/portal/remind
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12772

Modified Files:
	remind.sml 
Log Message:
Make clear difference between minimum balance and minimum payment

Index: remind.sml
===================================================================
RCS file: /cvsroot/hcoop/portal/remind/remind.sml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** remind.sml	15 Dec 2007 17:00:11 -0000	1.7
--- remind.sml	5 Jan 2008 12:55:27 -0000	1.8
***************
*** 35,38 ****
--- 35,40 ----
  			val m = Mail.mopen ()
  			fun write msg = Mail.mwrite (m, msg)
+ 
+ 			val minBal = 900.0 * real shares / real totalShares * 2.0
  		    in
  			if amount < 0.0 then
***************
*** 65,70 ****
  			write "\nTotal pledge amount: ";
  			write (Int.toString shares);
! 			write "\nRequested minimum: US$";
! 			write (printReal (900.0 * real shares / real totalShares * 2.0));
  
  			write "\n\nYour minimum was calculated by dividing our total monthly expenses ($900) by the\n";
--- 67,74 ----
  			write "\nTotal pledge amount: ";
  			write (Int.toString shares);
! 			write "\nRequested minimum balance: US$";
! 			write (printReal minBal);
! 			write "\nPayment to get there: US$";
! 			write (printReal (minBal - amount));
  
  			write "\n\nYour minimum was calculated by dividing our total monthly expenses ($900) by the\n";
***************
*** 73,83 ****
  
  			write "To make a payment, visit:\n";
! 			write "     https://members2.hcoop.net/\n";
  			write "and use the PayPal or Google Checkout link.\n";
  
- 			write "\nIf you don't know how to get a username and password for members2.hcoop.net, visit:\n";
- 			write "     http://wiki.hcoop.net/MemberManual/MigrationGuide\n";
- 			write "for a reminder.  (\"Step 1\" is all you need to read.)\n";
- 
  			write "\nIf for whatever reason you don't plan to pay the amount suggested in this e-mail,\n";
  			write "_please_ don't stay silent.  Reply to this message explaining your circumstances.\n";
--- 77,83 ----
  
  			write "To make a payment, visit:\n";
! 			write "     https://members.hcoop.net/\n";
  			write "and use the PayPal or Google Checkout link.\n";
  
  			write "\nIf for whatever reason you don't plan to pay the amount suggested in this e-mail,\n";
  			write "_please_ don't stay silent.  Reply to this message explaining your circumstances.\n";

Update of /cvsroot/hcoop/domtool2/lib
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28186/lib

Modified Files:
	easy_domain.dtl 
Log Message:
Shortcut for TXT default

Index: easy_domain.dtl
===================================================================
RCS file: /cvsroot/hcoop/domtool2/lib/easy_domain.dtl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** easy_domain.dtl	23 Dec 2007 22:41:38 -0000	1.21
--- easy_domain.dtl	1 Jan 2008 23:13:35 -0000	1.22
***************
*** 82,83 ****
--- 82,84 ----
  val dnsDefaultv6 = \to -> dns (dnsDefaultAAAA to);
  val dnsText = \from -> \to -> dns (dnsTXT from to);
+ val dnsDefaultText = \to -> dns (dnsDefaultTXT to);