diff options
Diffstat (limited to 'manifests/sympa.pp')
-rw-r--r-- | manifests/sympa.pp | 65 |
1 files changed, 4 insertions, 61 deletions
diff --git a/manifests/sympa.pp b/manifests/sympa.pp index 34ea084..2984469 100644 --- a/manifests/sympa.pp +++ b/manifests/sympa.pp @@ -14,8 +14,8 @@ class mail::sympa( } # Sympa subsystems - include mail::web::sympa - include mail::packages::sympa + include mail::sympa::web + include mail::sympa::packages # # Database configuration @@ -103,11 +103,11 @@ class mail::sympa( } postfix::transport_regexp_snippet { 'sympa_transport_regexp': - content => template('mail/postfix/sympa/transport_regexp.erb'), + content => template('mail/sympa/transport_regexp.erb'), } postfix::virtual_regexp_snippet { 'sympa_virtual_regexp': - content => template('mail/postfix/sympa/virtual_regexp.erb'), + content => template('mail/sympa/virtual_regexp.erb'), } postfix::config { @@ -173,60 +173,3 @@ class mail::sympa( notify => Exec["newaliases"], } } - -class mail::sympa::disabled inherits mail::sympa { - include mail::web::sympa::disabled - - Service["sympa"] { - ensure => stopped, - enable => false, - } - - Cron["sympa-restart"] { - ensure => absent, - } - - Postfix::Transport_regexp_snippet['sympa_transport_regexp'] { - content => undef, - } - - Postfix::Virtual_regexp_snippet['sympa_virtual_regexp'] { - content => undef, - } - - Mailalias["sympa"] { - ensure => absent, - } - - Mailalias["sympa-request"] { - ensure => absent, - } - - Mailalias["sympa-owner"] { - ensure => absent, - } - - Mailalias["abuse-feedback-report"] { - ensure => absent, - } - - Mailalias["bounce+*"] { - ensure => absent, - } - - Mailalias["listserv"] { - ensure => absent, - } - - Mailalias["listserv-request"] { - ensure => absent, - } - - Mailalias["listserv-owner"] { - ensure => absent, - } - - Mailalias["majordomo"] { - ensure => absent, - } -} |