##
-@def $SSH_SOURCES = <%=
-sshallowed = case hostname
- when 'logtest01' then '0.0.0.0/0'
+@def $SSH_SOURCES = (<%=
+
+sshallowed = []
+
+case hostname
+ when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
+end
+
+case hostname
+ when 'bartok', 'beethoven' then sshallowed << '$HOST_DEBIAN_V4'
+end
+
+if sshallowed.length == 0
+ sshallowed = [ '0.0.0.0/0' ]
+end
+
+sshallowed.join(' ')
+%>);
+
+@def $SSH_V6_SOURCES = (<%=
+
+sshallowed = []
+
+case hostname
+ when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
+end
+
+case hostname
+ when 'bartok', 'beethoven' then sshallowed << '$HOST_DEBIAN_V6'
+end
+
+if sshallowed.length == 0
+ sshallowed = [ '::' ]
end
-sshallowed
-%>
+
+sshallowed.join(' ')
+%>);
+
+def $SMTP_SOURCES =(<%=
+
+smtpallowed = []
+
+if not nodeinfo['smarthost'].empty?
+ smtpallowed = [ '$HOST_MAILRELAY_V4', '$HOST_NAGIOS_V4' ]
+end
+
+if smtpallowed.length == 0
+ smtpallowed = [ '0.0.0.0/0' ]
+end
+
+smtpallowed.join(' ')
+%>);
+
+def $SMTP_V6_SOURCES =(<%=
+
+smtpallowed = []
+
+if not nodeinfo['smarthost'].empty?
+ smtpallowed = [ '$HOST_MAILRELAY_V6', '$HOST_NAGIOS_V6' ]
+end
+
+if smtpallowed.length == 0
+ smtpallowed = [ '::' ]
+end
+
+smtpallowed.join(' ')
+%>);