aboutsummaryrefslogtreecommitdiff
path: root/manifests/classes
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-04-06 21:09:51 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-04-06 21:09:51 -0300
commit462db65ec48b6398c9a04a88cc4c197eb73f34fa (patch)
treebfba4b8b7ba7d3a6266b73bb48d8430ab52f881a /manifests/classes
parent6a4499081347474db5829995cfb97118fb6f2257 (diff)
parent5108973b37903047b8b17fbe54313cb4b6ea114f (diff)
downloadpuppet-postfix-462db65ec48b6398c9a04a88cc4c197eb73f34fa.tar.gz
puppet-postfix-462db65ec48b6398c9a04a88cc4c197eb73f34fa.tar.bz2
Merge branch 'master' of git://labs.riseup.net/shared-postfix
Diffstat (limited to 'manifests/classes')
-rw-r--r--manifests/classes/postfix.pp10
1 files changed, 8 insertions, 2 deletions
diff --git a/manifests/classes/postfix.pp b/manifests/classes/postfix.pp
index 4e9cd6f..63a50b9 100644
--- a/manifests/classes/postfix.pp
+++ b/manifests/classes/postfix.pp
@@ -64,6 +64,12 @@ class postfix {
case $postfix_mastercf_tail {
"": { $postfix_mastercf_tail = "" }
}
+ case $postfix_inet_interfaces {
+ "": { $postfix_inet_interfaces = 'all' }
+ }
+ case $postfix_myorigin {
+ "": { $postfix_myorigin = $fqdn }
+ }
# Bootstrap moduledir
include common::moduledir
@@ -151,9 +157,9 @@ class postfix {
# Default configuration parameters
postfix::config {
- "myorigin": value => "${fqdn}";
+ "myorigin": value => "${postfix_myorigin}";
"alias_maps": value => "hash:/etc/aliases";
- "inet_interfaces": value => "all";
+ "inet_interfaces": value => "${postfix_inet_interfaces}";
}
case $operatingsystem {