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/expire | |
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/expire')
-rw-r--r-- | manifests/expire/mysql.pp | 20 | ||||
-rw-r--r-- | manifests/expire/sqlite.pp | 29 |
2 files changed, 36 insertions, 13 deletions
diff --git a/manifests/expire/mysql.pp b/manifests/expire/mysql.pp new file mode 100644 index 0000000..5256d60 --- /dev/null +++ b/manifests/expire/mysql.pp @@ -0,0 +1,20 @@ +class dovecot::expire::mysql { + + file { 'dovecot-dict-expire.conf': + source => [ "puppet:///modules/site_dovecot/expire/${fqdn}/mysql-dict-expire.conf", + "puppet:///modules/site_dovecot/expire/mysql-dict-expire.conf", + "puppet:///modules/dovecot/expire/${operatingsystem}/mysql-dict-expire.conf", + "puppet:///modules/dovecot/expire/mysql-dict-expire.conf" ], + path => $operatingsystem ? { + 'debian' => '/etc/dovecot/dovecot-dict-expire.conf', + default => '/etc/dovecot-dict-expire.conf' + }, + require => $version ? { + 2 => Package['dovecot-mysql'], + default => Package['dovecot'], + }, + notify => Service['dovecot'], + owner => root, group => 0, mode => 0600; + } + +} diff --git a/manifests/expire/sqlite.pp b/manifests/expire/sqlite.pp index a9fed4b..b1724e1 100644 --- a/manifests/expire/sqlite.pp +++ b/manifests/expire/sqlite.pp @@ -1,19 +1,22 @@ class dovecot::expire::sqlite { - include ::sqlite - file{'/var/lib/dovecot/expire.db': - ensure => file, - replace => false, - require => Package['sqlite'], - owner => root, group => 0, mode => 0600; - } - file{'/var/lib/dovecot/expire.sql': - source => "puppet:///modules/dovecot/expire/expire.sqlite.sql", - require => File['/var/lib/dovecot/expire.db'], - notify => Exec['create_expire_db'], - owner => root, group => 0, mode => 0600; + + include dovecot::sql::sqlite + + file { + '/var/lib/dovecot/expire.db': + ensure => file, + replace => false, + require => Package['sqlite'], + owner => root, group => 0, mode => 0600; + + '/var/lib/dovecot/expire.sql': + source => "puppet:///modules/dovecot/expire/expire.sqlite.sql", + require => File['/var/lib/dovecot/expire.db'], + notify => Exec['create_expire_db'], + owner => root, group => 0, mode => 0600; } - exec{'create_expire_db': + exec { 'create_expire_db': command => 'cat /var/lib/dovecot/expire.sql | sqlite3 /var/lib/dovecot/expire.db', refreshonly => true, } |