summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Albertson <lance@osuosl.org>2020-09-14 11:30:35 -0700
committerLance Albertson <lance@osuosl.org>2020-09-14 11:30:35 -0700
commit70acac6d89afe2fcbb9c5c1e6cb3bd729a6ecb54 (patch)
tree7fb38323f9706ce2173b75e69e925471e7c948bb
parent198d241f8c5463a385dfa9bc709fa3724ca617f6 (diff)
downloadchef-70acac6d89afe2fcbb9c5c1e6cb3bd729a6ecb54.tar.gz
Move Chef::Dist::PATENTS to ChefUtils::Dist::Org::PATENTS
Signed-off-by: Lance Albertson <lance@osuosl.org>
-rw-r--r--chef-utils/lib/chef-utils/dist.rb3
-rw-r--r--lib/chef/application/knife.rb2
-rw-r--r--lib/chef/formatters/doc.rb2
-rw-r--r--lib/chef/formatters/minimal.rb2
4 files changed, 6 insertions, 3 deletions
diff --git a/chef-utils/lib/chef-utils/dist.rb b/chef-utils/lib/chef-utils/dist.rb
index 73c9c463af..fc3afd7717 100644
--- a/chef-utils/lib/chef-utils/dist.rb
+++ b/chef-utils/lib/chef-utils/dist.rb
@@ -56,6 +56,9 @@ module ChefUtils
# Enable forcing Chef EULA
ENFORCE_LICENSE = true
+
+ # product patents page
+ PATENTS = "https://www.chef.io/patents".freeze
end
class Server
diff --git a/lib/chef/application/knife.rb b/lib/chef/application/knife.rb
index fb79eb6d1a..3a86c3b832 100644
--- a/lib/chef/application/knife.rb
+++ b/lib/chef/application/knife.rb
@@ -221,7 +221,7 @@ class Chef::Application::Knife < Chef::Application
puts "#{Chef::Dist::PRODUCT}: #{Chef::VERSION}"
puts
puts "Docs: #{Chef::Dist::KNIFE_DOCS}"
- puts "Patents: #{Chef::Dist::PATENTS}"
+ puts "Patents: #{ChefUtils::Dist::Org::PATENTS}"
puts
end
diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb
index c92c405387..513ac45471 100644
--- a/lib/chef/formatters/doc.rb
+++ b/lib/chef/formatters/doc.rb
@@ -42,7 +42,7 @@ class Chef
def run_start(version, run_status)
puts_line "Starting #{ChefUtils::Dist::Infra::PRODUCT}, version #{version}"
- puts_line "Patents: #{Chef::Dist::PATENTS}"
+ puts_line "Patents: #{ChefUtils::Dist::Org::PATENTS}"
puts_line "Targeting node: #{Chef::Config.target_mode.host}" if Chef::Config.target_mode?
puts_line "OpenSSL FIPS 140 mode enabled" if Chef::Config[:fips]
end
diff --git a/lib/chef/formatters/minimal.rb b/lib/chef/formatters/minimal.rb
index 46855d5f14..6a067c4f86 100644
--- a/lib/chef/formatters/minimal.rb
+++ b/lib/chef/formatters/minimal.rb
@@ -29,7 +29,7 @@ class Chef
# Called at the very start of a Chef Run
def run_start(version, run_status)
puts_line "Starting #{ChefUtils::Dist::Infra::PRODUCT}, version #{version}"
- puts_line "Patents: #{Chef::Dist::PATENTS}"
+ puts_line "Patents: #{ChefUtils::Dist::Org::PATENTS}"
puts_line "Targeting node: #{Chef::Config.target_mode.host}" if Chef::Config.target_mode?
puts_line "OpenSSL FIPS 140 mode enabled" if Chef::Config[:fips]
end