Update lib

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 2a58423..99a1812 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -106,3 +106,5 @@ val dnsText = \from -> \to -> dns (dnsTXT (srv_literal from) to);
 val dnsDefaultText = \to -> dns (dnsTXT srv_default to);
 
 val dnsWildcardIP = \to -> dns (dnsA wildcard to);
+
+val addDefaultSPF = dnsDefaultText "v=spf1 mx -all";

diff --git a/lib/hcoop.dtl b/lib/hcoop.dtl
index c1f791d..7f547f2 100644 (file)
--- a/lib/hcoop.dtl
+++ b/lib/hcoop.dtl
@@ -14,12 +14,14 @@ val mailmanHcoop = mailmanWebHost "lists.hcoop.net";
 {{Configure your domain to have its Mailman mailing lists served on the web at
   lists.hcoop.net.}}
 
-val fritz_ip : (ip) = "69.90.123.75";
-val hopper_ip : (ip) = "69.90.123.74";
 val deleuze_ip : (ip) = "69.90.123.67";
 val mire_ip : (ip) = "69.90.123.68";
 val navajos_ip : (ip) = "69.90.123.70";
-val outpost_ip : (ip) = "74.115.254.28";
+val bog_ip : (ip) = "69.90.123.72";
+val hopper_ip : (ip) = "69.90.123.74";
+val fritz_ip : (ip) = "69.90.123.75";
+
+val outpost_ip : (ip) = "151.236.216.192";
 
 (* val fyodor_ip : (ip) = "64.20.38.170"; *)
 

diff --git a/lib/web_apps.dtl b/lib/web_apps.dtl
index 0ae5222..5d4da16 100644 (file)
--- a/lib/web_apps.dtl
+++ b/lib/web_apps.dtl
@@ -17,12 +17,15 @@ val wordPress = \ host : (host) ->
 {{Create a WordPress blog with just the standard set-up code.  The WordPress blog should
   be rooted at the vhost's <tt>DocumentRoot</tt>.}}
 
+val moin_default_htdocs : (location) = "/moin_static196";
+{{Alias for static content used by the system-wide MoinMoin.}}
+
 val addMoinMoin = begin
   htdocs <- Htdocs;
   prefix <- Prefix;
   script <- Script;
 
-  alias htdocs "/usr/share/moin/htdocs";
+  alias htdocs "/afs/hcoop.net/common/app/moin/installed/moin19/lib/python2.6/site-packages/MoinMoin/web/static/htdocs";
   scriptAlias prefix (end_in_slash script)
 end;
 {{Add a MoinMoin wiki to a vhost.}}
@@ -30,8 +33,29 @@ end;
 val moinMoin = \ host : (host) ->
   web host with
     addMoinMoin where
-      Htdocs = "/moin";
+      Htdocs = moin_default_htdocs;
       Prefix = "/"
     end
   end;
 {{Create a new vhost with just a MoinMoin wiki.}}
+
+(* Legacy version of moin macros *)
+
+val addMoinMoinOld = begin
+  htdocs <- Htdocs;
+  prefix <- Prefix;
+  script <- Script;
+
+  alias htdocs "/usr/share/moin/htdocs";
+  scriptAlias prefix (end_in_slash script)
+end;
+{{Add a MoinMoin wiki to a vhost.}}
+
+val moinMoinOld = \ host : (host) ->
+  webAt "mire" host with
+    addMoinMoinOld where
+      Htdocs = "/moin";
+      Prefix = "/"
+    end
+  end;
+{{Create a new vhost with just a MoinMoin wiki.}}
\ No newline at end of file