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 | |
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')
-rw-r--r-- | manifests/sql/mysql.pp | 9 | ||||
-rw-r--r-- | manifests/sql/pgsql.pp | 9 | ||||
-rw-r--r-- | manifests/sql/sqlite.pp | 9 |
3 files changed, 18 insertions, 9 deletions
diff --git a/manifests/sql/mysql.pp b/manifests/sql/mysql.pp index 378ed41..56cbb13 100644 --- a/manifests/sql/mysql.pp +++ b/manifests/sql/mysql.pp @@ -1,6 +1,9 @@ class dovecot::sql::mysql { - package{'dovecot-mysql': - ensure => installed, - before => File['/etc/dovecot-sql.conf'], + + if $version == 2 { + package { 'dovecot-mysql': + ensure => installed, + before => [ File['/etc/dovecot-sql.conf'], File['/etc/dovecot-dict-sql.conf'] ]; + } } } diff --git a/manifests/sql/pgsql.pp b/manifests/sql/pgsql.pp index 530e878..39f1b64 100644 --- a/manifests/sql/pgsql.pp +++ b/manifests/sql/pgsql.pp @@ -1,6 +1,9 @@ class dovecot::sql::pgsql { - package{'dovecot-pgsql': - ensure => installed, - before => File['/etc/dovecot-sql.conf'], + + if $version == 2 { + package { 'dovecot-pgsql': + ensure => installed, + before => File['/etc/dovecot-sql.conf'], + } } } diff --git a/manifests/sql/sqlite.pp b/manifests/sql/sqlite.pp index bc07fb7..c2a848e 100644 --- a/manifests/sql/sqlite.pp +++ b/manifests/sql/sqlite.pp @@ -1,6 +1,9 @@ class dovecot::sql::sqlite { - package{'dovecot-sqlite': - ensure => installed, - before => File['/etc/dovecot-sql.conf'], + + if $version == 2 { + package { 'dovecot-sqlite': + ensure => installed, + before => File['/etc/dovecot-sql.conf'], + } } } |