diff options
| author | Tom Duffield <tom@chef.io> | 2017-01-20 15:07:03 -0600 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2017-01-20 15:41:05 -0600 |
| commit | 71979951e3d429a77778cd661954f1715c48fb8c (patch) | |
| tree | 52c09cf4f97db047b09741ff874b439578e918ab | |
| parent | 8c68a52473831c14886a1568ca15eead0ea7af23 (diff) | |
| download | chef-71979951e3d429a77778cd661954f1715c48fb8c.tar.gz | |
Use new `fips_mode` variable to define whether to build with FIPSCOOL-663/tduffield/use-fips_mode-variable
Signed-off-by: Tom Duffield <tom@chef.io>
| -rw-r--r-- | omnibus/config/projects/chef.rb | 5 | ||||
| -rw-r--r-- | omnibus/omnibus.rb | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 3d92d290a0..a0e490ceab 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -39,11 +39,6 @@ else install_dir "#{default_root}/#{name}" end -# Global FIPS override flag. -if windows? || rhel? - override :fips, enabled: true -end - # Load dynamically updated overrides overrides_path = File.expand_path("../../../../omnibus_overrides.rb", current_file) instance_eval(IO.read(overrides_path), overrides_path) diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb index c6f883adbc..5bf50f98f9 100644 --- a/omnibus/omnibus.rb +++ b/omnibus/omnibus.rb @@ -52,3 +52,4 @@ fetcher_read_timeout 120 # local_software_dirs ['/path/to/local/software'] fatal_transitive_dependency_licensing_warnings true +fips_mode (ENV["OMNIBUS_FIPS_MODE"] || "").casecmp?("true") |