diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 14:01:39 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 14:01:39 -0200 |
| commit | 3933b4048a4437987930bb370dd99b7e189f67ae (patch) | |
| tree | 422c921949186de5fdcbe23e613188774b3c0796 /manifests/init.pp | |
| parent | ae05fced176bfdb5a23784614594306ef45ae9ee (diff) | |
| parent | 3e7dd131f38bf19d9ed8f38ba276a3d9bf4b1508 (diff) | |
| download | puppet-postfix-3933b4048a4437987930bb370dd99b7e189f67ae.tar.gz puppet-postfix-3933b4048a4437987930bb370dd99b7e189f67ae.tar.bz2 | |
Merge branch 'develop' into production
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index d298183..8ee2346 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -77,10 +77,12 @@ class postfix( 'Debian': { $master_cf_template = "postfix/master.cf.debian-${::operatingsystemmajrelease}.erb" + $postfix_seltype = undef } 'Ubuntu': { $master_cf_template = 'postfix/master.cf.debian-sid.erb' + $postfix_seltype = undef } default: { @@ -99,7 +101,7 @@ class postfix( include postfix::anonsasl } # this global variable needs to get parameterized as well - if $::header_checks == 'yes' { + if $manage_header_checks == 'yes' { include postfix::header_checks } if $manage_tls_policy == 'yes' { @@ -117,12 +119,18 @@ class postfix( include postfix::virtual_regexp } - package { ['postfix', 'mailx']: - ensure => installed + package { 'postfix': + ensure => installed, } - if $::operatingsystem == 'debian' { - Package[mailx] { name => 'bsd-mailx' } + if !defined(Package['mailx']) { + package { 'mailx': + ensure => installed, + name => $::operatingsystem ? { + debian => 'bsd-mailx', + default => 'mailx', + }, + } } service { 'postfix': |