From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Tue, 8 Mar 2011 16:35:23 +0000 (-0500)
Subject: Merge branch 'release'
X-Git-Tag: release_2011-03-19~1
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/1bbfba218ddbf087d66ead8b57bc109e3505862f?hp=883dd79c5d791f7b3d961917f8f2c3b58a1195ea

Merge branch 'release'
---

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index ef7c620..6a64a83 100644
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -28,7 +28,7 @@ val slaveNodes = ["mire", "outpost"]
 val dnsNodes_all = ["deleuze", "mire", "outpost"]
 val dnsNodes_admin = []
 
-val mailNodes_all = ["deleuze", "hopper"]
+val mailNodes_all = ["deleuze"]
 val mailNodes_admin = ["mire"]
 
 val aclFile = "/afs/hcoop.net/common/etc/domtool/acl"
diff --git a/configDefault/exim.cfg b/configDefault/exim.cfg
index 6118466..a1ef37a 100644
--- a/configDefault/exim.cfg
+++ b/configDefault/exim.cfg
@@ -7,7 +7,7 @@ val relayDomains = "/var/domtool/relay_domains.cfg"
 
 val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish exim"
 
-val aliasTo = ["deleuze", "hopper"]
+val aliasTo = ["deleuze"]
 
 val mainLog = "/var/log/exim4/mainlog"