summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-21 19:35:02 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-21 19:35:02 -0200
commit7a795af05b823a127658db71ee331c09f4b600f6 (patch)
tree95a27ac66b79a07b07a4e3e4e347021a4cb415bd
parent0344fedd46c288eaa50a3ba05c0692791cd93fa8 (diff)
downloadpuppet-mail-7a795af05b823a127658db71ee331c09f4b600f6.tar.gz
puppet-mail-7a795af05b823a127658db71ee331c09f4b600f6.tar.bz2
Fixing mail::regular and setting it the default
-rw-r--r--manifests/regular.pp2
-rw-r--r--manifests/system.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/regular.pp b/manifests/regular.pp
index da35e33..52f5235 100644
--- a/manifests/regular.pp
+++ b/manifests/regular.pp
@@ -1,5 +1,5 @@
class mail::regular {
postfix::config { "virtual_alias_maps":
- value => 'hash://postfix/virtual, regexp:/etc/postfix/virtual_regexp',
+ value => 'hash:/etc/postfix/virtual, regexp:/etc/postfix/virtual_regexp',
}
}
diff --git a/manifests/system.pp b/manifests/system.pp
index 872f170..a9568a1 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -32,7 +32,7 @@ class mail::system {
include mail::spamassassin
# Virtual mail system
- case hiera('mail_virtual', True) {
+ case hiera('mail_virtual', false) {
true: {
include mail::virtual
}