diff options
| author | kwadronaut <kwadronaut@leap.se> | 2018-12-11 17:38:54 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2018-12-11 17:38:54 +0100 |
| commit | dd537211c7885fc1bb880b30aadb2cc57e5d7a25 (patch) | |
| tree | 6a6645d7e694fe118565efae2b1696eb231159ce | |
| parent | e14722271a7700945874b72daed79240fbadaa4a (diff) | |
| parent | cb49c63dc54d124db1a07c758f2f7f303d23ee5d (diff) | |
Merge remote-tracking branch 'shared/master'
Include upstream minor fixes, get rid of wheezy workaround
| -rw-r--r-- | manifests/init.pp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 45c8e0c..cb5ca22 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -79,24 +79,13 @@ class postfix( } 'Debian': { - case $::operatingsystemrelease { - /^5.*/: { - $master_cf_template = 'postfix/master.cf.debian-5.erb' - } - /^6.*/: { - $master_cf_template = 'postfix/master.cf.debian-6.erb' - } - /^7.*/: { - $master_cf_template = 'postfix/master.cf.debian-7.erb' - } - default: { - $master_cf_template = "postfix/master.cf.debian-${::operatingsystemmajrelease}.erb" - } - } + $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: { @@ -115,7 +104,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' { |