diff --git a/config/software/gitlab-cookbooks.rb b/config/software/gitlab-cookbooks.rb index eb6af6a80817d2ea9d904a0ce1dfb9d34c78d08a_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1jb29rYm9va3MucmI=..75137403480ebb2725ed3820cd0162c8c612ddbb_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1jb29rYm9va3MucmI= 100644 --- a/config/software/gitlab-cookbooks.rb +++ b/config/software/gitlab-cookbooks.rb @@ -50,4 +50,13 @@ mode: 0644, vars: { master_cookbook: cookbook_name } end + + block do + if Build::Check.use_system_ssl? + solo_file = "#{install_dir}/embedded/cookbooks/solo.rb" + data = File.read(solo_file) + data.sub!(/^fips false/, 'fips true') + File.write(solo_file, data) + end + end end diff --git a/files/gitlab-cookbooks/solo.rb b/files/gitlab-cookbooks/solo.rb index eb6af6a80817d2ea9d904a0ce1dfb9d34c78d08a_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9zb2xvLnJi..75137403480ebb2725ed3820cd0162c8c612ddbb_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9zb2xvLnJi 100644 --- a/files/gitlab-cookbooks/solo.rb +++ b/files/gitlab-cookbooks/solo.rb @@ -12,6 +12,7 @@ report_handlers << GitLabHandler::Attributes.new verbose_logging false ssl_verify_mode :verify_peer +fips false # Log to the reconfigure log log_location "#{LOG_PATH}/#{TIME}.log"