Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

init.pp: correct param numbers and use of optional #315

Merged
merged 1 commit into from
Oct 19, 2021
Merged

init.pp: correct param numbers and use of optional #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 39 additions & 15 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
#
# [*configs*] - (hash)
#
# [*hash*] - (hash) A hash of postfix::hash resources
# [*hashes*] - (hash) A hash of postfix::hash resources
#
# [*transport*] - (hash) A hash of postfix::transport resources
# [*transports*] - (hash) A hash of postfix::transport resources
#
# [*virtual*] - (hash) A hash of postfix::virtual resources
# [*virtuals*] - (hash) A hash of postfix::virtual resources
#
# [*conffile*] - (hash) A hash of postfix::conffile resources
# [*conffiles*] - (hash) A hash of postfix::conffile resources
#
# [*amavis_procs*] - (integer) Number of amavis scanners to spawn
#
Expand Down Expand Up @@ -106,11 +106,11 @@
Stdlib::Absolutepath $confdir = '/etc/postfix',
String $root_group = 'root',
String $alias_maps = 'hash:/etc/aliases',
Optional[Hash] $configs = {},
Optional[Hash] $hash = {},
Optional[Hash] $transport = {},
Optional[Hash] $virtual = {},
Optional[Hash] $conffile = {},
Hash $configs = {},
Hash $hashes = {},
Hash $transports = {},
Hash $virtuals = {},
Hash $conffiles = {},
Integer $amavis_procs = 2,
String $inet_interfaces = 'all',
String $inet_protocols = 'all',
Expand All @@ -130,7 +130,7 @@
Optional[String] $master_smtp = undef, # postfix_master_smtp
Optional[String] $master_smtps = undef, # postfix_master_smtps
Optional[String] $master_submission = undef, # postfix_master_submission
Optional[Array[String]] $master_entries = undef, # postfix_master_entries
Array[String] $master_entries = [], # postfix_master_entries
String $master_bounce_command = 'bounce',
String $master_defer_command = 'bounce',
Boolean $mta = false,
Expand Down Expand Up @@ -170,11 +170,35 @@
true => "${alias_maps}, ldap:${confdir}/ldap-aliases.cf",
}

create_resources('::postfix::config', $configs)
create_resources('::postfix::transport', $transport)
create_resources('::postfix::virtual', $virtual)
create_resources('::postfix::hash', $hash)
create_resources('::postfix::conffile', $conffile)
$configs.each |$key, $value| {
postfix::config { $key:
* => $value,
}
}

$transports.each |$key, $value| {
postfix::transport { $key:
* => $value,
}
}

$virtuals.each |$key, $value| {
postfix::virtual { $key:
* => $value,
}
}

$hashes.each |$key, $value| {
postfix::hash { $key:
* => $value,
}
}

$conffiles.each |$key, $value| {
postfix::conffile { $key:
* => $value,
}
}

contain 'postfix::packages'
contain 'postfix::files'
Expand Down
16 changes: 8 additions & 8 deletions spec/classes/postfix_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,10 @@
is_expected.to contain_postfix__config('message_size_limit').with_value('51200000')
end
end
context 'when hash hash is used' do
context 'when hashes hash is used' do
let(:params) do
{
hash: {
hashes: {
'/etc/postfix/transport' => {
'ensure' => 'present',
},
Expand All @@ -505,10 +505,10 @@
is_expected.to contain_postfix__hash('/etc/postfix/transport').with_ensure('present')
end
end
context 'when transport hash is used' do
context 'when transports hash is used' do
let(:params) do
{
transport: {
transports: {
'local_relay' => {
'nexthop' => '[10.12.0.2]:9925',
},
Expand All @@ -520,10 +520,10 @@
is_expected.to contain_postfix__transport('local_relay').with_nexthop('[10.12.0.2]:9925')
end
end
context 'when virtual hash is used' do
context 'when virtuals hash is used' do
let(:params) do
{
virtual: {
virtuals: {
'someone@somedomain.tld' => {
'destination' => 'internal@ourdomain.tld',
},
Expand All @@ -535,10 +535,10 @@
is_expected.to contain_postfix__virtual('someone@somedomain.tld').with_destination('internal@ourdomain.tld')
end
end
context 'when conffile hash is used' do
context 'when conffiles hash is used' do
let(:params) do
{
conffile: {
conffiles: {
'ldapoptions.cf' => {
'mode' => '0640',
'options' => {
Expand Down
2 changes: 0 additions & 2 deletions templates/master.cf.common.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,4 @@ sympa unix - n n - - pipe
sympabounce unix - n n - - pipe
flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user}
<% end -%>
<% if @master_entries %>
<%= @master_entries.join("\n") %>
<% end -%>