hcoop: add testing server busted, allow admins to configure apache

Testing upgrade to Debian 10

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 7cb48f5..7a7db7d 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -15,7 +15,8 @@ val fixperms1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtoo
 val confDir = ConfigCore.localRoot ^ "/vhosts"
 
 val webNodes_all = [("shelob",  {version = APACHE_2, auth = MOD_WAKLOG})]
-val webNodes_admin = [("minsky", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("minsky", {version = APACHE_2, auth = MOD_WAKLOG}),
+                      ("busted", {version = APACHE_2, auth = MOD_WAKLOG})]
 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 0a1154b..70d1fcd 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -7,7 +7,7 @@ val oldResultRoot = ConfigCore.sharedRoot ^ "/nodes.old"
 
 val domtool_publish = ConfigCore.installPrefix ^ "/sbin/domtool-publish"
 
-val nodeIps = [("outpost", "151.236.216.192", "2a01:7e00::f03c:91ff:fe70:7c62"), ("gibran", "142.93.177.82", "2604:a880:800:c1::99:5001"), ("marsh", "45.55.52.66", "2604:a880:800:a1::13a3:f001"), ("minsky", "104.248.1.95", "2604:a880:800:c1::b1:5001"), ("shelob", "68.183.54.165", "2604:a880:800:c1::d:3001"), ("lovelace", "68.183.58.241", "2604:a880:800:c1::c2:7001")]
+val nodeIps = [("outpost", "151.236.216.192", "2a01:7e00::f03c:91ff:fe70:7c62"), ("gibran", "142.93.177.82", "2604:a880:800:c1::99:5001"), ("marsh", "45.55.52.66", "2604:a880:800:a1::13a3:f001"), ("minsky", "104.248.1.95", "2604:a880:800:c1::b1:5001"), ("shelob", "68.183.54.165", "2604:a880:800:c1::d:3001"), ("lovelace", "68.183.58.241", "2604:a880:800:c1::c2:7001"), ("busted", "64.225.6.23", "2604:a880:800:c1::1fe:7001")]
 val dispatcherName = "gibran"
 
 val dnsNodes_all = ["outpost", "gibran"]

diff --git a/lib/hcoop.dtl b/lib/hcoop.dtl
index 8e35af6..db725ba 100644 (file)
--- a/lib/hcoop.dtl
+++ b/lib/hcoop.dtl
@@ -28,6 +28,10 @@ val outpost_ip : (ip) = "151.236.216.192";
 val outpost_ipv6 : (ipv6) = "2a01:7e00::f03c:91ff:fe70:7c62";
 
 (* Digital Ocean *)
+val busted_ip : (ip) = "64.225.6.23";
+val busted_private_ip : (ip) = "2604:a880:800:c1::1fe:7001";
+val busted_ipv6 : (ipv6) = "10.132.165.25";
+
 val gibran_ip : (ip) = "142.93.177.82";
 val gibran_private_ip : (ip) = "10.132.5.78";
 val gibran_ipv6 : (ipv6) = "2604:a880:800:c1::99:5001";