diff options
Diffstat (limited to 'manifests/expire.pp')
| -rw-r--r-- | manifests/expire.pp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/expire.pp b/manifests/expire.pp index bd1a043..7eb5c6a 100644 --- a/manifests/expire.pp +++ b/manifests/expire.pp @@ -1,6 +1,6 @@ class dovecot::expire ( $type = 'sqlite', $mail_location = '', $dirs = '', $days = '' ) { - file { '/etc/cron.daily/dovecot-expire': + file{'/etc/cron.daily/dovecot-expire': owner => root, group => 0, mode => 0755; } @@ -28,10 +28,10 @@ class dovecot::expire ( $type = 'sqlite', $mail_location = '', $dirs = '', $days } } default: { - File['/etc/cron.daily/dovecot-expire']{ - content => "dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool.sh\n" - } - } + File['/etc/cron.daily/dovecot-expire']{ + content => "dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool.sh\n" + } + } } } else { # dovecot version 2 way (no mail_location, dirs need to be space separated variables and expire script runs doveadm expunge) @@ -47,7 +47,7 @@ class dovecot::expire ( $type = 'sqlite', $mail_location = '', $dirs = '', $days } } } - + if $type != 'legacy' and $type != 'mysql' and $version != 2 { file{'/etc/dovecot-expire.conf': source => [ "puppet:///modules/site_dovecot/expire/${fqdn}/dovecot-expire.conf", @@ -59,7 +59,7 @@ class dovecot::expire ( $type = 'sqlite', $mail_location = '', $dirs = '', $days owner => root, group => 0, mode => 0600; } - file { '/usr/libexec/dovecot/expire-tool.sh': + file{'/usr/libexec/dovecot/expire-tool.sh': source => "puppet:///modules/dovecot/expire/expire-tool.sh", owner => root, group => 0, mode => 0700; } |