Cleanup

diff --git a/manifests/firma.pp b/manifests/firma.pp
index 3d5194fed185dc506f20db95a2defeb7929e8b5e..dafbbcb98210f9aee01eb01db044751a47252567 100644 (file)
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -9,18 +9,6 @@ class mail::firma(
 
   mail::firma::domain { "${subdomain}.${domain}": }
 
-  # TODO: remove in the future
-  postfix::transport_regexp_snippet { "firma_transport_regexp":
-    ensure  => absent,
-    content => template('mail/firma/transport_regexp.erb'),
-  }
-
-  # TODO: remove in the future
-  postfix::virtual_regexp_snippet { "firma_virtual_regexp":
-    ensure  => absent,
-    content => template('mail/firma/virtual_regexp.erb'),
-  }
-
   postfix::transport { "${subdomain}.$domain":
     ensure      => absent,
     destination => "firma",

diff --git a/manifests/mlmmj/domain.pp b/manifests/mlmmj/domain.pp
index 939036a5c717cbf87b3786e03b4decda05f778a2..d8c7f270f36375f6df0c1fb78931930e0844363e 100644 (file)
--- a/manifests/mlmmj/domain.pp
+++ b/manifests/mlmmj/domain.pp
@@ -4,10 +4,4 @@ define mail::mlmmj::domain() {
   #postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}":
   #  content => template('mail/mlmmj/transport_regexp.erb'),
   #}
-
-  # TODO: This is not needed anymore as everything ins handled by mail::mlmmj::list
-  postfix::virtual_regexp_snippet { "mlmmj_virtual_regexp-${name}":
-    ensure  => absent,
-    content => template('mail/mlmmj/virtual_regexp.erb'),
-  }
 }

diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 94c89add3d3cf88631b60deb734d0e5e05e4e625..6ddf0dc22e0597a87f474eaa280ba642b56202a1 100644 (file)
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -113,18 +113,6 @@ class mail::sympa(
 
   mail::sympa::domain { "${subdomain}.${domain}": }
 
-  # TODO: remove in the future
-  postfix::transport_regexp_snippet { "sympa_transport_regexp":
-    ensure  => absent,
-    content => template('mail/sympa/transport_regexp.erb'),
-  }
-
-  # TODO: remove in the future
-  postfix::virtual_regexp_snippet { "sympa_virtual_regexp":
-    ensure  => absent,
-    content => template('mail/sympa/virtual_regexp.erb'),
-  }
-
   postfix::config {
     "sympa_destination_recipient_limit":       value => '1', nonstandard => true;
     "sympabounce_destination_recipient_limit": value => '1', nonstandard => true;

diff --git a/templates/mlmmj/virtual_regexp.erb b/templates/mlmmj/virtual_regexp.erb
deleted file mode 100644 (file)
index e93ebcd..0000000
--- a/templates/mlmmj/virtual_regexp.erb
+++ /dev/null
@@ -1 +0,0 @@
-/^(.*)\@<%= subdomain.gsub(/\./, '\.') %>$/                    ${1}