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

#3398: Fix for FIPS enabled in bookshelf using bookshelf s3 url with … #1

Merged
merged 1 commit into from
Jul 8, 2022
Merged

#3398: Fix for FIPS enabled in bookshelf using bookshelf s3 url with … #1

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
5 changes: 3 additions & 2 deletions omnibus/files/server-ctl-cookbooks/infra-server/templates/default/oc_erchef.config.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,9 @@
%%
%% This is the reason that the only supported configuration for the fips
%% package is standalone. We will allow http over localhost so that the
%% chef server can talk to bookshelf.
{s3_url, "http://<%= node['private_chef']['bookshelf']['listen'] %>:<%= node['private_chef']['bookshelf']['port'] %>"},
%% chef server can talk to bookshelf. We can give provide bookshelf['url'] = 'http://127.0.0.1:4321' for naking it work for FIPS enabled
%% {s3_url, "http://<%= node['private_chef']['bookshelf']['listen'] %>:<%= node['private_chef']['bookshelf']['port'] %>"},
{s3_url, "<%= @helper.bookshelf_s3_url %>"},
<% else -%>
{s3_url, "<%= @helper.bookshelf_s3_url %>"},
<% end %>
Expand Down