opuppet/module-postfix
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use the concat module instead of the concatenated_file defined (Closes: #4074)

Browse source
This commit is contained in:
intrigeri 2012-12-30 15:43:06 +01:00
parent 2c86670a92
commit 985ec1fe0a
5 changed files with 68 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
README
View file

@ -4,6 +4,10 @@ This module will help install and configure postfix.
A couple of classes will preconfigure postfix for common needs. A couple of classes will preconfigure postfix for common needs.
This module needs:
- the concat module: git://labs.riseup.net/shared-concat
Config Config
------ ------
- set $postfix_use_amavisd="yes" to include postfix::amavis - set $postfix_use_amavisd="yes" to include postfix::amavis
@ -28,3 +32,24 @@ Config
postfix::config { "relay_domains": value => "localhost host.foo.com" } postfix::config { "relay_domains": value => "localhost host.foo.com" }
Deprecation notice
------------------
It used to be that one could drop header checks snippets into the
following source directories:
"puppet:///modules/site-postfix/${fqdn}/header_checks.d"
"puppet:///modules/site-postfix/header_checks.d"
"puppet:///files/etc/postfix/header_checks.d"
"puppet:///modules/postfix/header_checks.d"
... and TLS policy snippets into those:
"puppet:///modules/site-postfix/${fqdn}/tls_policy.d"
"puppet:///modules/site-postfix/tls_policy.d"
"puppet:///modules/postfix/tls_policy.d"
This is not supported anymore.
Every such snippet much now be configured using the (respectively)
postfix::header_checks_snippet and postfix::tlspolicy_snippet defines.

61
manifests/header_checks.pp
View file

@ -1,57 +1,32 @@
# #
# == Class: postfix::header_checks # == Class: postfix::header_checks
# #
# Manages Postfix header_checks by merging snippets shipped: # Manages Postfix header_checks by merging snippets configured
# - in the module's files/header_checks.d/ or puppet:///files/etc/postfix/header_checks.d # via postfix::header_checks_snippet defines
# (the latter takes precedence if present); site-postfix module is supported
# as well, see the source argument of file {"$postfix_header_checks_snippets_dir"
# bellow for details.
# - via postfix::header_checks_snippet defines
# #
# Example usage: # Note that this class is useless when used directly.
# # The postfix::header_checks_snippet defines takes care of importing
# node "toto.example.com" { # it anyway.
# $postfix_manage_header_checks = yes
# include postfix
# }
# #
class postfix::header_checks { class postfix::header_checks {
include common::moduledir concat { '/etc/postfix/header_checks':
module_dir{'postfix/header_checks': } owner => root,
group => root,
$postfix_header_checks_dir = "${common::moduledir::module_dir_path}/postfix/header_checks" mode => '0600',
$postfix_header_checks_snippets_dir = "${postfix_header_checks_dir}/header_checks.d"
$postfix_merged_header_checks = "${postfix_header_checks_dir}/merged_header_checks"
file {"$postfix_header_checks_snippets_dir":
ensure => 'directory',
owner => 'root',
group => '0',
mode => '700',
source => [
"puppet:///modules/site-postfix/${fqdn}/header_checks.d",
"puppet:///modules/site-postfix/header_checks.d",
"puppet:///files/etc/postfix/header_checks.d",
"puppet:///modules/postfix/header_checks.d",
],
recurse => true,
purge => false,
}
concatenated_file { "$postfix_merged_header_checks":
dir => "${postfix_header_checks_snippets_dir}",
require => File["$postfix_header_checks_snippets_dir"],
}
config_file { '/etc/postfix/header_checks':
source => "$postfix_merged_header_checks",
subscribe => File["$postfix_merged_header_checks"],
} }
postfix::config { "header_checks": postfix::config { "header_checks":
value => 'regexp:/etc/postfix/header_checks', value => 'regexp:/etc/postfix/header_checks',
require => File['/etc/postfix/header_checks'], require => Concat['/etc/postfix/header_checks'],
}
# Cleanup previous implementation's internal files
include common::moduledir
file { "${common::moduledir::module_dir_path}/postfix/header_checks":
ensure => absent,
recurse => true,
force => true,
} }
} }

15
manifests/header_checks_snippet.pp
View file

@ -43,23 +43,20 @@ define postfix::header_checks_snippet (
include postfix::header_checks include postfix::header_checks
$snippetfile = "${postfix::header_checks::postfix_header_checks_snippets_dir}/${name}" $fragment = "postfix_header_checks_${name}"
file { "$snippetfile": concat::fragment { "$fragment":
ensure => "$ensure", ensure => "$ensure",
mode => 600, target => '/etc/postfix/header_checks',
owner => root,
group => 0,
notify => Exec["concat_${postfix::header_checks::postfix_merged_header_checks}"],
} }
if $source { if $source {
File["$snippetfile"] { Concat::Fragment["$fragment"] {
source => $source, source => $source,
} }
} }
else { else {
File["$snippetfile"] { Concat::Fragment["$fragment"] {
content => $content, content => $content,
} }
} }

47
manifests/tlspolicy.pp
View file

@ -1,22 +1,15 @@
# #
# == Class: postfix::tlspolicy # == Class: postfix::tlspolicy
# #
# Manages Postfix TLS policy by merging policy snippets shipped: # Manages Postfix TLS policy by merging policy snippets configured
# - in the module's files/tls_policy.d/ or puppet:///files/etc/postfix/tls_policy.d # via postfix::tlspolicy_snippet defines
# (the latter takes precedence if present); site-postfix module is supported
# as well, see the source argument of file {"$postfix_tlspolicy_snippets_dir"
# bellow for details.
# - via postfix::tlspolicy_snippet defines
# #
# Parameters: # Parameters:
# - $postfix_tls_fingerprint_digest (defaults to sha1) # - $postfix_tls_fingerprint_digest (defaults to sha1)
# #
# Example usage: # Note that this class is useless when used directly.
# # The postfix::tlspolicy_snippet defines takes care of importing
# node "toto.example.com" { # it anyway.
# $postfix_manage_tls_policy = yes
# include postfix
# }
# #
class postfix::tlspolicy { class postfix::tlspolicy {
@ -29,26 +22,13 @@ class postfix::tlspolicy {
module_dir{'postfix/tls_policy': } module_dir{'postfix/tls_policy': }
$postfix_tlspolicy_dir = "${common::moduledir::module_dir_path}/postfix/tls_policy" $postfix_tlspolicy_dir = "${common::moduledir::module_dir_path}/postfix/tls_policy"
$postfix_tlspolicy_snippets_dir = "${postfix_tlspolicy_dir}/tls_policy.d"
$postfix_merged_tlspolicy = "${postfix_tlspolicy_dir}/merged_tls_policy" $postfix_merged_tlspolicy = "${postfix_tlspolicy_dir}/merged_tls_policy"
file {"$postfix_tlspolicy_snippets_dir": concat { "$postfix_merged_tlspolicy":
ensure => 'directory', require => File[$postfix_tlspolicy_dir],
owner => 'root', owner => root,
group => '0', group => root,
mode => '700', mode => '0600',
source => [
"puppet:///modules/site-postfix/${fqdn}/tls_policy.d",
"puppet:///modules/site-postfix/tls_policy.d",
"puppet:///modules/postfix/tls_policy.d",
],
recurse => true,
purge => false,
}
concatenated_file { "$postfix_merged_tlspolicy":
dir => "${postfix_tlspolicy_snippets_dir}",
require => File["$postfix_tlspolicy_snippets_dir"],
} }
postfix::hash { '/etc/postfix/tls_policy': postfix::hash { '/etc/postfix/tls_policy':
@ -68,4 +48,11 @@ class postfix::tlspolicy {
], ],
} }
# Cleanup previous implementation's internal files
file { "${postfix_tlspolicy_dir}/tls_policy.d":
ensure => absent,
recurse => true,
force => true,
}
} }

7
manifests/tlspolicy_snippet.pp
View file

@ -35,13 +35,10 @@ define postfix::tlspolicy_snippet ($ensure="present", $value = false) {
fail("The value parameter must be set when using the postfix::tlspolicy_snippet define with ensure=present.") fail("The value parameter must be set when using the postfix::tlspolicy_snippet define with ensure=present.")
} }
file { "${postfix::tlspolicy::postfix_tlspolicy_snippets_dir}/${name}": concat::fragment { "postfix_tlspolicy_${name}":
ensure => "$ensure", ensure => "$ensure",
content => "${name} ${value}\n", content => "${name} ${value}\n",
mode => 600, target => "$postfix::tlspolicy::postfix_merged_tlspolicy",
owner => root,
group => 0,
notify => Exec["concat_${postfix::tlspolicy::postfix_merged_tlspolicy}"],
} }
} }