Skip to content
Snippets Groups Projects
Verified Commit 019896e1 authored by Antoine Beaupré's avatar Antoine Beaupré
Browse files

postfix: yolo try to see why my merge is not working

parent ca94792a
Branches
No related tags found
No related merge requests found
...@@ -28,10 +28,12 @@ class profile::postfix::satellite( ...@@ -28,10 +28,12 @@ class profile::postfix::satellite(
'virtual_alias_maps' => 'hash:/etc/postfix/virtual', 'virtual_alias_maps' => 'hash:/etc/postfix/virtual',
} }
} else { } else {
$extra_params = {} $extra_params = {
'foo' => 'bar',
}
} }
class { 'profile::postfix': class { 'profile::postfix':
extra_parameters => deep_merge($params, $extra_params), extra_parameters => $params + $extra_params,
} }
postfix::config::service { 'smtptlsc': postfix::config::service { 'smtptlsc':
master_cf_file => '/etc/postfix/master.cf', master_cf_file => '/etc/postfix/master.cf',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment