Skip to content

feat(config): allow to specify dc_mailname_in_oh #20

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

Open
javierbertoli wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(config): allow to specify dc_mailname_in_oh #20

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
3 changes: 3 additions & 0 deletions exim/files/default/update-exim4.conf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ dc_minimaldns='{{ exim.minimaldns | lower }}'
dc_readhost='{{ exim.readhost }}'
dc_smarthost='{{ join_if_list(exim.smarthost) }}'
CFILEMODE='{{ exim.cfilemode }}'
{%- if exim.dc_mailname_in_oh %}
dc_mailname_in_oh='{{ exim.dc_mailname_in_oh | lower }}'
{% endif %}
1 change: 1 addition & 0 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ exim:
relay_domains: ''
relay_nets: ''
smarthost: ''
dc_mailname_in_oh: 'true'
mailname: foo.bar.baz
aliases:
root: root@bar.baz
Expand Down
1 change: 1 addition & 0 deletions test/integration/default/controls/config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
its('content') { should include "dc_local_interfaces='127.0.0.1'" }
its('content') { should include "dc_hide_mailname='false'" }
its('content') { should include "dc_use_split_config='false'" }
its('content') { should include "dc_mailname_in_oh='true'" }
end

describe file('/etc/mailname') do
Expand Down
1 change: 1 addition & 0 deletions test/salt/pillar/exim.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ exim:
configtype: satellite
hide_mailname: 'false'
use_split_config: false
dc_mailname_in_oh: 'true'
other_hostnames:
- foo.bar.baz
- bar.baz.foo
Expand Down