diff options
| author | Tom Duffield <tom@chef.io> | 2017-01-23 14:36:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 14:36:00 -0600 |
| commit | 211972112f9ff5886b5638db93099ff813558368 (patch) | |
| tree | b420f903c2c8e9aec30cc052ab962bcb59f41ebb | |
| parent | 1bd1e953f92d47afee94b06cf692eb1eb2c0bff6 (diff) | |
| parent | 71979951e3d429a77778cd661954f1715c48fb8c (diff) | |
| download | chef-211972112f9ff5886b5638db93099ff813558368.tar.gz | |
Merge pull request #5746 from chef/COOL-663/tduffield/use-fips_mode-variable
Use new `fips_mode` variable to define whether to build with FIPS
| -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") |