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/init.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/init.pp')
| -rw-r--r-- | manifests/init.pp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index a3b34ad..29d6da7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,16 +5,17 @@ class dovecot( $pgsql = false, $mysql = false, $nagios_checks = { - 'imap-hostname' => $::fqdn, - 'pop3-hostname' => $::fqdn, + 'imap-hostname' => $fqdn, + 'pop3-hostname' => $fqdn, }, $munin_checks = true, - $manage_shorewall = true + $manage_shorewall = true, + $version = 2 ){ - case $::operatingsystem { - centos: { include dovecot::centos } - 'Debian','Ubuntu': { include dovecot::debian } - default: { include dovecot::base } + case $operatingsystem { + centos: { include dovecot::centos } + debian: { include dovecot::debian } + default: { include dovecot::base } } if $dovecot::sqlite or $dovecot::pgsql or $dovecot::mysql { |