Fixing mail::regular and setting it the default

diff --git a/manifests/regular.pp b/manifests/regular.pp
index da35e333859160af744d0dba32aafcdfa6ba5655..52f523596c21f21c9073cdcba88368f7bb54039e 100644 (file)
--- 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 872f1706eb7b27ae072ff96bbaaa67e03c2d39a6..a9568a1ca6175ed32ab76d9a68f396b276584174 100644 (file)
--- 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
     }