Merge pull request #2795 from chef/pricing_page

Update URLs for our pricing page
chef · Sep 7, 2021 · 6ce3468 · 6ce3468
2 parents 067b093 + bf9b519
commit 6ce3468
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/docs-chef-io/content/server/api_chef_server.md b/docs-chef-io/content/server/api_chef_server.md
@@ -363,7 +363,7 @@ The response is similar to:
   "limit_exceeded": false,
   "node_license": 25,
   "node_count": 12,
-  "upgrade_url": "http://www.chef.io/contact/on-premises-simple"
+  "upgrade_url": "https://www.chef.io/pricing"
 }
 ```
 
@@ -394,7 +394,7 @@ number of nodes that are under license:
 </tr>
 <tr class="even">
 <td><code>license['upgrade_url']</code></td>
-<td>The URL to visit for more information about how to update the number of nodes licensed for an organization. Default value: <code>"http://www.chef.io/contact/on-premises-simple"</code>.</td>
+<td>The URL to visit for more information about how to update the number of nodes licensed for an organization. Default value: <code>"https://www.chef.io/pricing"</code>.</td>
 </tr>
 </tbody>
 </table>

diff --git a/docs-chef-io/content/server/v13_2/config_rb_server_optional_settings.md b/docs-chef-io/content/server/v13_2/config_rb_server_optional_settings.md
@@ -94,7 +94,7 @@ Chef Infra Server versions earlier than 14.5 that are configured with `nginx['en
 
 :   The URL to visit for more information about how to update the number
     of nodes licensed for an organization. Default value:
-    `'http://www.chef.io/contact/on-premises-simple'`.
+    `https://www.chef.io/pricing'`.
 
 `notification_email`
 

diff --git a/docs-chef-io/content/server/v14/config_rb_server_optional_settings.md b/docs-chef-io/content/server/v14/config_rb_server_optional_settings.md
@@ -90,7 +90,7 @@ Chef Infra Server versions earlier than 14.5 configured with `nginx['enable_non_
 
 :   The URL to visit for more information about how to update the number
     of nodes licensed for an organization. Default value:
-    `'http://www.chef.io/contact/on-premises-simple'`.
+    `'https://www.chef.io/pricing'`.
 
 `notification_email`
 

diff --git a/oc-chef-pedant/spec/api/license_spec.rb b/oc-chef-pedant/spec/api/license_spec.rb
@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 #
 # Author:: Douglas Triggs (<doug@chef.io>)
-# Copyright:: Copyright (c) 2014 Chef, Inc.
+# Copyright:: Copyright (c) Chef Software, Inc.
 
 require 'pedant/rspec/node_util'
 
@@ -19,7 +18,7 @@
       "limit_exceeded" => (node_count > MAX_NODE_COUNT ) ? true : false,
       "node_license" => MAX_NODE_COUNT,
       "node_count" => node_count,
-      "upgrade_url" => /^http\:\/\.*/
+      "upgrade_url" => /^https\:\/\.*/
     }}
 
   context "GET /license" do

diff --git a/omnibus/files/private-chef-cookbooks/private-chef/attributes/default.rb b/omnibus/files/private-chef-cookbooks/private-chef/attributes/default.rb
@@ -44,7 +44,7 @@
 default['private_chef']['from_email'] = '"Opscode" <donotreply@chef.io>'
 default['private_chef']['role'] = 'standalone'
 default['private_chef']['license']['nodes'] = 25
-default['private_chef']['license']['upgrade_url'] = 'http://www.chef.io/contact/on-premises-simple'
+default['private_chef']['license']['upgrade_url'] = 'https://www.chef.io/pricing'
 
 default['private_chef']['default_orgname'] = nil
 

diff --git a/src/oc_erchef/habitat/config/sys.config b/src/oc_erchef/habitat/config/sys.config
@@ -103,7 +103,7 @@
         %% their own logical section, but erlang requires these to
         %% be part of a loaded application
         {node_license, {{node_license}} },
-        {upgrade_url, <<"http://www.chef.io/contact/on-premises-simple">>},
+        {upgrade_url, <<"https://www.chef.io/pricing">>},
         {max_request_size, {{max_request_size }} },
         {server_version, "{{server_version}}"},
         {health_ping_timeout, 400},

diff --git a/src/oc_erchef/raml-docs/schemas/server-license.json b/src/oc_erchef/raml-docs/schemas/server-license.json
@@ -24,6 +24,6 @@
     "limit_exceeded": true,
     "node_license": 25,
     "node_count": 370007,
-    "upgrade_url": "http://www.chef.io/contact/on-premises-simple"
+    "upgrade_url": "https://www.chef.io/pricing"
   }
 }