gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gitaly-fips-mode' into 'master' 

Set FIPS_MODE for gitaly and git for FIPS builds

Closes #6851

See merge request gitlab-org/omnibus-gitlab!6109
This commit is contained in:
Robert Marshall 2022-06-02 23:44:35 +00:00
parent cc82179805 31a3fede54
commit 878a2ed011
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/software/git.rb
View File

@ -67,7 +67,11 @@ build do
"GIT_APPEND_BUILD_OPTIONS += CFLAGS=\"#{git_cflags}\""
]
build_options << "GIT_APPEND_BUILD_OPTIONS += OPENSSLDIR=#{install_dir}/embedded" unless Build::Check.use_system_ssl?
if Build::Check.use_system_ssl?
env['FIPS_MODE'] = '1'
else
build_options << "GIT_APPEND_BUILD_OPTIONS += OPENSSLDIR=#{install_dir}/embedded"
end
block do
File.open(File.join(project_dir, 'config.mak'), 'a') do |file|

1
config/software/gitaly.rb
View File

@ -52,6 +52,7 @@ build do
if Build::Check.use_system_ssl?
env['CMAKE_FLAGS'] = OpenSSLHelper.cmake_flags
env['PKG_CONFIG_PATH'] = OpenSSLHelper.pkg_config_dirs
env['FIPS_MODE'] = '1'
end
bundle "config set --local frozen 'true'"