summaryrefslogtreecommitdiff
path: root/manifests/base.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/base.pp')
-rw-r--r--manifests/base.pp45
1 files changed, 33 insertions, 12 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 19cafbf..1cd9996 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -4,27 +4,48 @@ class dovecot::base {
}
file{'/etc/dovecot.conf':
- source => [ "puppet:///modules/site_dovecot/config/${::fqdn}/dovecot.conf",
- "puppet:///modules/site_dovecot/config/${dovecot::type}/dovecot.conf",
- "puppet:///modules/site_dovecot/config/dovecot.conf",
- "puppet:///modules/dovecot/config/${::operatingsystem}/dovecot.conf",
- "puppet:///modules/dovecot/config/dovecot.conf" ],
+ source => [ "puppet:///modules/site_dovecot/config/${::fqdn}/dovecot.conf",
+ "puppet:///modules/site_dovecot/config/${::dovecot::type}/dovecot.conf",
+ 'puppet:///modules/site_dovecot/config/dovecot.conf',
+ "puppet:///modules/dovecot/config/${::operatingsystem}/dovecot.conf",
+ 'puppet:///modules/dovecot/config/dovecot.conf' ],
require => Package['dovecot'],
notify => Service['dovecot'],
- owner => root, group => mail, mode => 0640;
+ owner => root,
+ group => mail,
+ mode => '0644';
}
- file{'/var/log/dovecot':
+ file { 'dovecot_config_dir':
ensure => directory,
+ path => '/etc/dovecot/conf.d',
require => Package['dovecot'],
- before => Service['dovecot'],
- owner => dovecot, group => 12, mode => 0660,
+ owner => dovecot,
+ group => 0,
+ mode => '0755';
}
- file{ [ '/var/log/dovecot/error.log',
- '/var/log/dovecot/infos.log' ]:
+
+ file {
+ '/var/log/dovecot':
+ ensure => directory,
require => Package['dovecot'],
before => Service['dovecot'],
- owner => root, group => 12, mode => 0660;
+ owner => dovecot,
+ group => dovecot,
+ mode => '0750';
+
+ [ '/var/log/dovecot/error.log',
+ '/var/log/dovecot/dovecot.log' ]:
+ require => Package['dovecot'],
+ before => Service['dovecot'],
+ owner => root,
+ group => dovecot,
+ mode => '0660';
+ }
+
+ package { 'dovecot':
+ ensure => installed,
+ alias => 'dovecot'
}
include dovecot::logrotate