diff options
| author | varac <varacanero@zeromail.org> | 2014-02-25 15:43:42 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-25 15:43:42 +0100 |
| commit | c2539d1ea132e137d29f3183e7aac568462865b0 (patch) | |
| tree | aa71997081abe88e95fd07d8e532ce8afbcf7cea /manifests/sql.pp | |
| parent | 705fd0a13dc4d2f073819947159e28b54c286550 (diff) | |
| parent | 34333c48ba5662228c37a70eb099ec9a5f96b5ac (diff) | |
Merge branch 'leap_master'
Conflicts:
files/munin/dovecot
manifests/base.pp
manifests/centos.pp
manifests/debian.pp
manifests/expire.pp
manifests/init.pp
manifests/munin.pp
manifests/quota.pp
manifests/sieve.pp
manifests/sql.pp
Diffstat (limited to 'manifests/sql.pp')
| -rw-r--r-- | manifests/sql.pp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/manifests/sql.pp b/manifests/sql.pp index 0db154b..b35ebdc 100644 --- a/manifests/sql.pp +++ b/manifests/sql.pp @@ -1,15 +1,27 @@ class dovecot::sql { + file{'/etc/dovecot-sql.conf': - source => [ "puppet:///modules/site_dovecot/sql/${::fqdn}/dovecot-sql.conf", + source => [ "puppet:///modules/site_dovecot/sql/${fqdn}/dovecot-sql.conf", "puppet:///modules/site_dovecot/sql/${dovecot::type}/dovecot-sql.conf", "puppet:///modules/site_dovecot/sql/dovecot-sql.conf", - "puppet:///modules/site/sql/${::operatingsystem}/dovecot-sql.conf", + "puppet:///modules/site/sql/${operatingsystem}/dovecot-sql.conf", "puppet:///modules/site/sql/dovecot-sql.conf" ], require => Package['dovecot'], notify => Service['dovecot'], owner => root, group => 0, mode => 0600; } + file { '/etc/dovecot-dict-sql.conf': + source => [ "puppet:///modules/site_dovecot/sql/${fqdn}/dovecot-dict-sql.conf", + "puppet:///modules/site_dovecot/sql/${dovecot::type}/dovecot-dict-sql.conf", + "puppet:///modules/site_dovecot/sql/dovecot-dict-sql.conf", + "puppet:///modules/site/sql/${operatingsystem}/dovecot-dict-sql.conf", + "puppet:///modules/site/sql/dovecot-dict-sql.conf" ], + require => Package['dovecot'], + notify => Service['dovecot'], + owner => root, group => 0, mode => 0600; + } + if $dovecot::mysql { include ::dovecot::sql::mysql } @@ -19,4 +31,9 @@ class dovecot::sql { if $dovecot::sqlite { include ::dovecot::sql::sqlite } + + if $operatingsystem == 'Debian' { + File['/etc/dovecot-sql.conf'] { path => '/etc/dovecot/dovecot-sql.conf' } + File['/etc/dovecot-dict-sql.conf'] { path => '/etc/dovecot/dovecot-dict-sql.conf' } + } } |