Using transport_regexp and virtual_regexp management from postfix module

5 files changed, 23 insertions, 31 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 90b3966..fc1824f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -14,3 +14,5 @@ import "web.pp"
 import "sympa.pp"
 import "base.pp"
 import "spamassassin.pp"
+import "firma.pp"
+import "mlmmj.pp"
diff --git a/manifests/packages.pp b/manifests/packages.pp
index 0f947d8..6a8cc4c 100644
--- a/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -46,3 +46,9 @@ class mail::packages::schleuder {
     ensure => installed,
   } 
 }
+
+class mail::packages::mlmmj {
+  package { 'mlmmj':
+    ensure => installed,
+  } 
+}
diff --git a/manifests/regexps.pp b/manifests/regexps.pp
deleted file mode 100644
index d05ad68..0000000
--- a/manifests/regexps.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class mail::regexps {
-  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'],
-  }
-}
diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 3674f03..0fbc871 100644
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -1,4 +1,4 @@
-class mail::sympa inherits mail::regexps {
+class mail::sympa {
   # Sympa subsystems
   include mail::web::sympa
   include mail::packages::sympa
@@ -83,11 +83,11 @@ class mail::sympa inherits mail::regexps {
     source => "puppet:///modules/mail/sympa/logrotate",
   }
 
-  File["/etc/postfix/transport_regexp"] {
+  postfix::transport_regexp { 'sympa_transport_regexp':
     content => template('mail/postfix/sympa/transport_regexp.erb'),
   }
 
-  File["/etc/postfix/virtual_regexp"] {
+  postfix::virtual_regexp { 'sympa_virtual_regexp':
     content => template('mail/postfix/sympa/virtual_regexp.erb'),
   }
 
@@ -163,11 +163,11 @@ class mail::sympa::disabled inherits mail::sympa {
     enable    => false,
   }
 
-  File["/etc/postfix/transport_regexp"] {
+  Postfix::Transport_regexp['sympa_transport_regexp'] {
     content => undef,
   }
 
-  File["/etc/postfix/virtual_regexp"] {
+  Postfix::Virtual_regexp['sympa_virtual_regexp'] {
     content => undef,
   }
 
diff --git a/manifests/system.pp b/manifests/system.pp
index f9cd31b..b0926f5 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -1,12 +1,14 @@
 class mail::system {
-  $postfix_smtp_listen           = "all"
-  $postfix_use_amavisd           = "yes"
-  $postfix_use_dovecot_lda       = "yes"
-  $postfix_use_schleuder         = "yes"
-  $postfix_use_sympa             = "yes"
-  $postfix_anon_sasl             = "yes"
-  $postfix_mydestination         = '$myhostname, localhost.$mydomain, localhost'
-  $postfix_default_relay_domains = '$mydestination'
+  $postfix_smtp_listen             = "all"
+  $postfix_use_amavisd             = "yes"
+  $postfix_use_dovecot_lda         = "yes"
+  $postfix_use_schleuder           = "yes"
+  $postfix_use_sympa               = "yes"
+  $postfix_anon_sasl               = "yes"
+  $postfix_manage_transport_regexp = "yes"
+  $postfix_manage_virtual_regexp   = "yes"
+  $postfix_mydestination           = '$myhostname, localhost.$mydomain, localhost'
+  $postfix_default_relay_domains   = '$mydestination'
 
   case $postfix_mynetworks {
     '': { $postfix_mynetworks = "127.0.0.0/8" }
@@ -48,7 +50,6 @@ class mail::system {
       include mail::sympa::disabled
     }
     default: {
-      include mail::regexps
     }
   }