From be7b79d2ff86ace755cd1d17c4e9869707ca3a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Mon, 22 Jul 2013 17:59:48 +0200
Subject: [PATCH] mynetworks defaults to 127.0.0.1/8
---
manifests/mta.pp | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/manifests/mta.pp b/manifests/mta.pp
index 50d306a..bb3e5c1 100644
--- a/manifests/mta.pp
+++ b/manifests/mta.pp
@@ -33,20 +33,25 @@
class postfix::mta {
$mydestination = $postfix::mydestination ? {
- undef => $postfix::myorigin,
+ undef => '$myorigin',
default => $postfix::mydestination,
}
+ $mynetworks = $postfix::mynetworks ? {
+ undef => '127.0.0.1/8',
+ default => $postfix::mynetworks,
+ }
+
validate_re($postfix::relayhost, '^\S+$',
'You must pass $relayhost to the postfix class')
validate_re($mydestination, '^\S+$',
- 'You must pass $mydestination to the postfix class')
- validate_re($postfix::mynetworks, '^\S+$',
- 'You must pass $mynetworks to the postfix class')
+ 'Wrong value for $mydestination')
+ validate_re($mynetworks, '^\S+$',
+ 'Wrong value for $mynetworks')
postfix::config {
'mydestination': value => $mydestination;
- 'mynetworks': value => $postfix::mynetworks;
+ 'mynetworks': value => $mynetworks;
'relayhost': value => $postfix::relayhost;
'virtual_alias_maps': value => 'hash:/etc/postfix/virtual';
'transport_maps': value => 'hash:/etc/postfix/transport';
--
GitLab