From 48c4786da587600c90a01ebcda147d7b30e0ad11 Mon Sep 17 00:00:00 2001 From: Clinton Ebadi Date: Sun, 9 Dec 2018 15:01:49 -0500 Subject: [PATCH] hcoop: remove mccarthy and navajos from domtool control servers are decommissioned --- configDefault/apache.cfg | 6 ++---- configDefault/domtool.cfg | 4 ++-- configDefault/firewall.cfg | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg index a65b7d8..e55ca99 100644 --- a/configDefault/apache.cfg +++ b/configDefault/apache.cfg @@ -14,10 +14,8 @@ val fixperms1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtoo val confDir = ConfigCore.localRoot ^ "/vhosts" -val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG}), - ("shelob", {version = APACHE_2, auth = MOD_WAKLOG})] -val webNodes_admin = [("mccarthy", {version = APACHE_2, auth = NO_AUTH}), - ("minsky", {version = APACHE_2, auth = MOD_WAKLOG})] +val webNodes_all = [("shelob", {version = APACHE_2, auth = MOD_WAKLOG})] +val webNodes_admin = [("minsky", {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 9499db6..88c22cd 100644 --- a/configDefault/domtool.cfg +++ b/configDefault/domtool.cfg @@ -7,13 +7,13 @@ 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", "142.93.177.82"), ("marsh", "45.55.52.66"), ("minsky", "104.248.1.95"), ("shelob", "68.183.54.165"), ("lovelace", "68.183.58.241")] +val nodeIps = [("fritz", "69.90.123.75"), ("bog", "69.90.123.72"), ("outpost", "151.236.216.192"), ("gibran", "142.93.177.82"), ("marsh", "45.55.52.66"), ("minsky", "104.248.1.95"), ("shelob", "68.183.54.165"), ("lovelace", "68.183.58.241")] val dispatcherName = "gibran" val dnsNodes_all = ["fritz", "outpost", "gibran"] val dnsNodes_admin = [] -val mailNodes_all = ["mccarthy", "minsky"] +val mailNodes_all = ["minsky"] val mailNodes_admin = [ ] val aclFile = ConfigCore.sharedRoot ^ "/acl" diff --git a/configDefault/firewall.cfg b/configDefault/firewall.cfg index c2b3be9..1976d28 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", "shelob"] +val firewallNodes = ["bog", "marsh", "shelob"] val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish firewallpuppet" val dig = "/usr/bin/dig" -- 2.20.1