diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:25:46 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:25:46 -0200 |
| commit | 7cc8c05c571d18b9a39eb5643dd9af26d31005ff (patch) | |
| tree | 00932722b7f819681d69777d97f20d8e27cd7b22 /manifests/hash.pp | |
| parent | 74b5b00bbd18c1ead3a6425530666817e50ffb96 (diff) | |
| parent | 881a59ac62684028a7f4cb358e3592efc3ae99a9 (diff) | |
| download | puppet-postfix-7cc8c05c571d18b9a39eb5643dd9af26d31005ff.tar.gz puppet-postfix-7cc8c05c571d18b9a39eb5643dd9af26d31005ff.tar.bz2 | |
Merge branch 'master' of ssh://labs.riseup.net/shared-postfix
Conflicts:
manifests/definitions/header_checks_snippet.pp
manifests/header_checks.pp
manifests/header_checks_snippet.pp
manifests/init.pp
manifests/tlspolicy.pp
manifests/virtual_regexp_snippet.pp
Diffstat (limited to 'manifests/hash.pp')
| -rw-r--r-- | manifests/hash.pp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/manifests/hash.pp b/manifests/hash.pp index c8bb7c7..6e2012f 100644 --- a/manifests/hash.pp +++ b/manifests/hash.pp @@ -29,23 +29,7 @@ Example usage: */ define postfix::hash ($ensure="present", $source = false) { - - # selinux labels differ from one distribution to another - case $operatingsystem { - - RedHat, CentOS: { - case $lsbmajdistrelease { - "4": { $postfix_seltype = "etc_t" } - "5": { $postfix_seltype = "postfix_etc_t" } - default: { $postfix_seltype = undef } - } - } - - default: { - $postfix_seltype = undef - } - } - + include ::postfix case $source { false: { file {"${name}": @@ -53,7 +37,7 @@ define postfix::hash ($ensure="present", $source = false) { mode => 600, owner => root, group => root, - seltype => $postfix_seltype, + seltype => $postfix::postfix_seltype, require => Package["postfix"], } } @@ -64,7 +48,7 @@ define postfix::hash ($ensure="present", $source = false) { owner => root, group => root, source => $source, - seltype => $postfix_seltype, + seltype => $postfix::postfix_seltype, require => Package["postfix"], } } @@ -74,7 +58,7 @@ define postfix::hash ($ensure="present", $source = false) { ensure => $ensure, mode => 600, require => [File["${name}"], Exec["generate ${name}.db"]], - seltype => $postfix_seltype, + seltype => $postfix::postfix_seltype, } exec {"generate ${name}.db": |