From: Clinton Ebadi Date: Sat, 7 Jul 2018 23:29:00 +0000 (-0400) Subject: hcoop: add new server shelob.hcoop.net X-Git-Tag: release_20180707~2 X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/30a16a203b3615f98ad2a66354b0adabc2c9069f hcoop: add new server shelob.hcoop.net New webserver, to replace navajos. --- diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg index 83b2a28..6cd96b1 100644 --- a/configDefault/apache.cfg +++ b/configDefault/apache.cfg @@ -14,8 +14,9 @@ val fixperms1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtoo val confDir = ConfigCore.localRoot ^ "/vhosts" -val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG})] val webNodes_admin = [("mccarthy", {version = APACHE_2, auth = NO_AUTH})] +val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG}), + ("shelob", {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 5f92f79..a4f5843 100644 --- 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 = [("fritz", "69.90.123.75"), ("navajos", "69.90.123.70"), ("bog", "69.90.123.72"), ("mccarthy", "69.90.123.73"), ("outpost", "151.236.216.192"), ("gibran", "159.203.101.102"), ("marsh", "165.227.79.103"), ("minsky", "138.197.104.192")] +val nodeIps = [("fritz", "69.90.123.75"), ("navajos", "69.90.123.70"), ("bog", "69.90.123.72"), ("mccarthy", "69.90.123.73"), ("outpost", "151.236.216.192"), ("gibran", "159.203.101.102"), ("marsh", "165.227.79.103"), ("minsky", "138.197.104.192"), ("shelob", "165.227.126.167")] val dispatcherName = "fritz" val dnsNodes_all = ["fritz", "outpost"] diff --git a/configDefault/firewall.cfg b/configDefault/firewall.cfg index 5d8a513..c2b3be9 100644 --- a/configDefault/firewall.cfg +++ b/configDefault/firewall.cfg @@ -3,7 +3,7 @@ structure Firewall :> FIREWALL_CONFIG = struct val firewallRules = ConfigCore.sharedRoot ^ "/firewall/user.rules" val firewallDir = ConfigCore.localRoot ^ "/firewall/" -val firewallNodes = ["bog", "navajos", "marsh"] +val firewallNodes = ["bog", "navajos", "marsh", "shelob"] val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish firewallpuppet" val dig = "/usr/bin/dig" diff --git a/lib/hcoop.dtl b/lib/hcoop.dtl index 19db641..d06cb60 100644 --- a/lib/hcoop.dtl +++ b/lib/hcoop.dtl @@ -39,6 +39,9 @@ val minsky_ip : (ip) = "138.197.104.192"; val minsky_private_ip : (ip) = "10.132.150.187"; val minsky_ipv6 : (ipv6) = "2604:a880:800:a1::1232:e001"; +val shelob_ip : (ip) = "165.227.126.167"; +val shelob_private_ip : (ip) = "10.132.10.58"; +val shelob_ipv6 : (ipv6) = "2604:a880:800:a1::14a3:7001"; (* val fyodor_ip : (ip) = "64.20.38.170"; *) val simpleWeb = \host -> \docroot -> web host where