aboutsummaryrefslogtreecommitdiff
path: root/manifests/classes/postfix-mta.pp
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-10 18:32:12 +0100
committerintrigeri <intrigeri@boum.org>2010-11-10 18:32:12 +0100
commit07c02213dbd453523a07857a6dc15a25fc4b5bde (patch)
tree7dfd11fc181f93399037a15a7900dda30fd1d7ef /manifests/classes/postfix-mta.pp
parentb8fc529f06ce01b38142ab920388a921701c3c73 (diff)
parent96b41a3e47819846cc8bb0b626f4f8b705b77890 (diff)
downloadpuppet-postfix-07c02213dbd453523a07857a6dc15a25fc4b5bde.tar.gz
puppet-postfix-07c02213dbd453523a07857a6dc15a25fc4b5bde.tar.bz2
Merge remote branch 'nadir/master'
Conflicts: manifests/classes/postfix.pp
Diffstat (limited to 'manifests/classes/postfix-mta.pp')
-rw-r--r--manifests/classes/postfix-mta.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/classes/postfix-mta.pp b/manifests/classes/postfix-mta.pp
index 16b1981..c36c0bc 100644
--- a/manifests/classes/postfix-mta.pp
+++ b/manifests/classes/postfix-mta.pp
@@ -32,9 +32,9 @@
#
class postfix::mta {
- case $postfix_relayhost {
- "": { fail("Required \$postfix_relayhost variable is not defined.") }
- }
+ #case $postfix_relayhost {
+ # "": { fail("Required \$postfix_relayhost variable is not defined.") }
+ #}
case $postfix_mydestination {
"": { $postfix_mydestination = "\$myorigin" }