Major refactor to enhance per-subsystem config isolation

1 files changed, 3 insertions, 50 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index f3b68e4..a8bd59a 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -11,65 +11,18 @@ class mail::base {
     "virtual_mailbox_base":                value => '/var/mail/virtual';
     "virtual_uid_maps":                    value => 'static:5000';
     "virtual_gid_maps":                    value => 'static:5000';
-    "virtual_transport":                   value => 'dovecot';
-    "dovecot_destination_recipient_limit": value => '1';
     "recipient_delimiter":                 value => '+';
   }
 
-  postfix::hash { "/etc/postfix/virtual":
-    ensure => present,
-  }
-
-  postfix::hash { "/etc/postfix/transport":
-    ensure => present,
-  }
-
   # Recipient restrictions
   postfix::config { "smtpd_recipient_restrictions":
     value => 'permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, reject_rbl_client psbl.surriel.com, check_policy_service inet:127.0.0.1:60000' }
 
-  # Virtual mailboxes
-  file { '/var/mail/virtual':
-    ensure  => directory,
-    owner   => vmail,
-    group   => vmail,
-    mode    => 0750,
-    require => User['vmail'],
-  }
-
-  group { "vmail":
+  postfix::hash { "/etc/postfix/virtual":
     ensure => present,
-    gid    => 5000,
   }
 
-  user { "vmail":
-    ensure   => present,
-    uid      => 5000,
-    gid      => "vmail",
-    password => "*",
-    home     => '/var/mail/virtual',
-    require  => Group['vmail'],
-  }
-
-  # Sympa mailing list manager
-  case $mail_sympa {
-    true: { }
-    default: {
-      file { "/etc/postfix/transport_regexp":
-        ensure  => present,
-        owner   => root,
-        group   => root,
-        mode    => 0644,
-        notify  => Service['postfix'],
-      }
-    
-      file { "/etc/postfix/virtual_regexp":
-        ensure  => present,
-        owner   => root,
-        group   => root,
-        mode    => 0644,
-        notify  => Service['postfix'],
-      }
-    }
+  postfix::hash { "/etc/postfix/transport":
+    ensure => present,
   }
 }