Refactoring for 2.7 compatibility

1 files changed, 6 insertions, 6 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index f4bb97f..c6dd4af 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,11 +1,11 @@
 class mail::base {
   # Postfix configuration
   postfix::config {
-    "mydomain":                            value => "$domain";
-    "myhostname":                          value => "$fqdn";
-    "mydestination":                       value => "$postfix_mydestination";
-    "mynetworks":                          value => "$postfix_mynetworks";
-    "relay_domains":                       value => "$postfix_relay_domains";
+    "mydomain":                            value => "$::domain";
+    "myhostname":                          value => "$::fqdn";
+    "mydestination":                       value => "${mail::system::postfix_mydestination}";
+    "mynetworks":                          value => "${mail::system::postfix_mynetworks}";
+    "relay_domains":                       value => "${mail::system::postfix_relay_domains}";
     "transport_maps":                      value => "hash:/etc/postfix/transport, regexp:/etc/postfix/transport_regexp";
     "mailbox_command":                     value => '/usr/bin/maildrop -d ${USER}';
     "virtual_mailbox_base":                value => '/var/mail/virtual';
@@ -15,7 +15,7 @@ class mail::base {
   }
 
   # Postgrey port configuration
-  $postgrey_port = $lsbdistcodename ? {
+  $postgrey_port = $::lsbdistcodename ? {
     'lenny' => '60000',
     default => '10023',
   }