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

correct sendmail configuration #1130

Merged
merged 1 commit into from
Sep 20, 2023
Merged

correct sendmail configuration #1130

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
4 changes: 2 additions & 2 deletions spec/classes/foreman_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
.with_concurrency(1)
.with_queues(['dynflow_orchestrator'])
}
it {

Check failure on line 140 in spec/classes/foreman_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

foreman on ubuntu-20.04-x86_64 with default parameters is expected to contain Service[postgresqld] that notifies Service[dynflow-sidekiq@orchestrator]

Failure/Error:
  is_expected.to contain_service('postgresqld')
    .that_notifies('Service[dynflow-sidekiq@orchestrator]')

  expected that the catalogue would contain Service[postgresqld]

Check failure on line 140 in spec/classes/foreman_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

foreman on redhat-8-x86_64 with default parameters is expected to contain Service[postgresqld] that notifies Service[dynflow-sidekiq@orchestrator]

Failure/Error:
  is_expected.to contain_service('postgresqld')
    .that_notifies('Service[dynflow-sidekiq@orchestrator]')

  expected that the catalogue would contain Service[postgresqld]

Check failure on line 140 in spec/classes/foreman_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

foreman on debian-11-x86_64 with default parameters is expected to contain Service[postgresqld] that notifies Service[dynflow-sidekiq@orchestrator]

Failure/Error:
  is_expected.to contain_service('postgresqld')
    .that_notifies('Service[dynflow-sidekiq@orchestrator]')

  expected that the catalogue would contain Service[postgresqld]

Check failure on line 140 in spec/classes/foreman_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

foreman on centos-8-x86_64 with default parameters is expected to contain Service[postgresqld] that notifies Service[dynflow-sidekiq@orchestrator]

Failure/Error:
  is_expected.to contain_service('postgresqld')
    .that_notifies('Service[dynflow-sidekiq@orchestrator]')

  expected that the catalogue would contain Service[postgresqld]
is_expected.to contain_service('postgresqld')
.that_notifies('Service[dynflow-sidekiq@orchestrator]')
}
Expand Down Expand Up @@ -262,8 +262,8 @@

it 'should configure certificates in settings.yaml' do
is_expected.to contain_concat__fragment('foreman_settings+01-header.yaml')
.with_content(%r{^:email_sendmail_location: "/usr/bin/mysendmail"$})
.with_content(%r{^:email_sendmail_arguments: "--myargument"$})
.with_content(%r{^:sendmail_location: "/usr/bin/mysendmail"$})
.with_content(%r{^:sendmail_arguments: "--myargument"$})
.with_content(%r{^:websockets_ssl_key: /etc/ssl/private/snakeoil-ws\.pem$})
.with_content(%r{^:websockets_ssl_cert: /etc/ssl/certs/snakeoil-ws\.pem$})
end
Expand Down
4 changes: 2 additions & 2 deletions templates/settings.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@

# Email settings
<% if scope.lookupvar("foreman::email_sendmail_location") -%>
:email_sendmail_location: "<%= scope.lookupvar("foreman::email_sendmail_location") %>"
:sendmail_location: "<%= scope.lookupvar("foreman::email_sendmail_location") %>"
<% end -%>
<% if scope.lookupvar("foreman::email_sendmail_arguments") -%>
:email_sendmail_arguments: "<%= scope.lookupvar("foreman::email_sendmail_arguments") %>"
:sendmail_arguments: "<%= scope.lookupvar("foreman::email_sendmail_arguments") %>"
<% end -%>
<% end -%>

Expand Down
Loading