From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 10 Sep 2013 20:17:10 +0000 (+0200)
Subject: Allow ssh from mail relays to adayevskaya
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c5466c1241ab33ad556f1a9b5428f384962fcb6d;p=mirror%2Fdsa-puppet.git

Allow ssh from mail relays to adayevskaya
---

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 73c0809ee..3a726d642 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -40,6 +40,11 @@ if restrict_ssh.include?(hostname) then
 		ssh6allowed << '$UNGER_SSH6_ACCESS' # Ganneff, but more address space
 	end
 
+	if %w{adayevskaya}.include?(hostname) then
+		ssh4allowed << %w{$HOST_MAILRELAY_V4}
+		ssh6allowed << %w{$HOST_MAILRELAY_V6}
+	end
+
 	if nodeinfo['static_master'] then
 		ssh4allowed << '$HOST_STATIC_V4'
 		ssh6allowed << '$HOST_STATIC_V6'