X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fmail_incoming_port.pp;h=e8db01d41ed60e44e7b33ca228e4983a0e90a045;hb=d88b26cb9fad29c6f0d42b21889ecc55d5e766bb;hp=d16d5bc749085d54733971d81cfe1759b7bd02ae;hpb=7d961995db18550eaf69682a49736101d2f91257;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/mail_incoming_port.pp b/modules/debian_org/manifests/mail_incoming_port.pp
index d16d5bc74..e8db01d41 100644
--- a/modules/debian_org/manifests/mail_incoming_port.pp
+++ b/modules/debian_org/manifests/mail_incoming_port.pp
@@ -1,16 +1,16 @@
 class debian_org::mail_incoming_port {
-	case getfromhash($site::nodeinfo, 'mail_port') {
-		Numeric: { $mail_port = sprintf("%d", getfromhash($site::nodeinfo, 'mail_port')) }
+	case getfromhash($deprecated::nodeinfo, 'mail_port') {
+		Numeric: { $mail_port = sprintf("%d", getfromhash($deprecated::nodeinfo, 'mail_port')) }
 		/^(\d+)$/: { $mail_port = $1 }
 		default: { $mail_port = '25' }
 	}
 
-	@ferm::rule { 'dsa-mail':
+	ferm::rule { 'dsa-mail':
 		description => 'Allow SMTP',
 		rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
 	}
 
-	@ferm::rule { 'dsa-mail-v6':
+	ferm::rule { 'dsa-mail-v6':
 		description => 'Allow SMTP',
 		domain      => 'ip6',
 		rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"