diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:01:00 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:01:00 -0200 |
commit | 86515e9a0f27d36e38faee05beb03cbb99677e73 (patch) | |
tree | 355b620ee9ea98be6d54f87c506b64b2024c8076 /manifests/mlmmj.pp | |
parent | 14d954ff02564493192fe1fc9ad3a148ba20ef60 (diff) | |
download | puppet-mail-86515e9a0f27d36e38faee05beb03cbb99677e73.tar.gz puppet-mail-86515e9a0f27d36e38faee05beb03cbb99677e73.tar.bz2 |
Refactoring for 2.7 compatibility
Diffstat (limited to 'manifests/mlmmj.pp')
-rw-r--r-- | manifests/mlmmj.pp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp index 9db4356..6c58b79 100644 --- a/manifests/mlmmj.pp +++ b/manifests/mlmmj.pp @@ -1,4 +1,7 @@ -class mail::mlmmj { +class mail::mlmmj( + $subdomain = hiera('mlmmj_subdomain', 'mlmmj') +) { + include mail::packages::mlmmj include mail::web::mlmmj::disabled @@ -46,13 +49,13 @@ class mail::mlmmj { # # That's why we need one definition per mailing list. define list($ensure = 'present') { - postfix::transport_regexp_snippet { "mlmmj_transport_regexp-$name": - content => "/^($name)\\@.*$/ mlmmj:$name\n", + postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}": + content => "/^(${name})\\@.*$/ mlmmj:${name}\n", ensure => $ensure, } - postfix::transport_regexp_snippet { "mlmmj_transport_regexp-$name-request": - content => "/^($name)\\+.*\\@.*$/ mlmmj:$name\n", + postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}-request": + content => "/^(${name})\\+.*\\@.*$/ mlmmj:${name}\n", ensure => $ensure, } } |