Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / debian_org / manifests / mail_incoming_port.pp

diff --git a/modules/debian_org/manifests/mail_incoming_port.pp b/modules/debian_org/manifests/mail_incoming_port.pp
index d16d5bc..e8db01d 100644 (file)
--- 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)"