-
Notifications
You must be signed in to change notification settings - Fork 210
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into im/server_options
- Loading branch information
Showing
9 changed files
with
145 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 15.9.16 | ||
| 15.9.18 |
38 changes: 6 additions & 32 deletions
38
docs-chef-io/content/server/reusable/md/server_rbac_permissions_object.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,8 @@ | ||
| The Chef Infra Server includes the following object permissions: | ||
|
|
||
| <table> | ||
| <colgroup> | ||
| <col style="width: 12%" /> | ||
| <col style="width: 87%" /> | ||
| </colgroup> | ||
| <thead> | ||
| <tr class="header"> | ||
| <th>Permission</th> | ||
| <th>Description</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <td><strong>Delete</strong></td> | ||
| <td>Use the <strong>Delete</strong> permission to define which users and groups may delete an object. This permission is required for any user who uses the <code>knife [object] delete [object_name]</code> argument to interact with objects on the Chef Infra Server.</td> | ||
| </tr> | ||
| <tr> | ||
| <td><strong>Grant</strong></td> | ||
| <td>Use the <strong>Grant</strong> permission to define which users and groups may configure permissions on an object. This permission is required for any user who configures permissions using the <strong>Administration</strong> tab in the Chef management console.</td> | ||
| </tr> | ||
| <tr> | ||
| <td><strong>Read</strong></td> | ||
| <td>Use the <strong>Read</strong> permission to define which users and groups may view the details of an object. This permission is required for any user who uses the <code>knife [object] show [object_name]</code> argument to interact with objects on the Chef Infra Server.</td> | ||
| </tr> | ||
| <tr> | ||
| <td><strong>Update</strong></td> | ||
| <td>Use the <strong>Update</strong> permission to define which users and groups may edit the details of an object. This permission is required for any user who uses the <code>knife [object] edit [object_name]</code> argument to interact with objects on the Chef Infra Server and for any Chef Infra Client to save node data to the Chef Infra Server at the conclusion of a Chef Infra Client run.</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
|
|
||
| {{/* moved to chef-server repo */}} | ||
| | Permission | Description | | ||
| | --- | --- | | ||
| | **Delete** | Use the **Delete** permission to define which users and groups may delete an object. This permission is required for any user who uses the `knife [object] delete [object_name]` argument to interact with objects on the Chef Infra Server. | | ||
| | **Grant** | Use the **Grant** permission to define which users and groups may configure permissions on an object. This permission is required for any user who configures permissions using the **Administration** tab in the Chef management console. | | ||
| | **Read** | Use the **Read** permission to define which users and groups may view the details of an object. This permission is required for any user who uses the `knife [object] show [object_name]` argument to interact with objects on the Chef Infra Server. | | ||
| | **Update** | Use the **Update** permission to define which users and groups may edit the details of an object. This permission is required for any user who uses the `knife [object] edit [object_name]` argument to interact with objects on the Chef Infra Server and for any Chef Infra Client to save node data to the Chef Infra Server at the conclusion of a Chef Infra Client run. | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| module FeatureFlagHelper | ||
| def gtm_enabled? | ||
| Settings.enable_gtm == true | ||
| end | ||
|
|
||
| def onetrust_enabled? | ||
| Settings.enable_onetrust == true | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <% if gtm_enabled? %> | ||
| <!-- Google Tag Manager conditional --> | ||
| <%= javascript_tag type: "text/javascript" do %> | ||
| var oneTrustHelper = (function () { | ||
| function evalGTMScript() { | ||
| var gtmScript = document.getElementById("GTMScript"); | ||
| gtmScript.type = "text/javascript"; | ||
| gtmScript.classList.remove("optanon-category-1"); | ||
| eval(gtmScript.innerHTML); | ||
| }; | ||
|
|
||
| return { | ||
| gtmFallback: function () { | ||
| console.warn('OneTrust not loaded.'); | ||
| if (document.readyState !== 'loading') { | ||
| evalGTMScript(); | ||
| } else { | ||
| document.addEventListener('readystatechange', function () { | ||
| if (document.readyState === 'interactive') { | ||
| evalGTMScript(); | ||
| } | ||
| }); | ||
| }; | ||
| } | ||
| }; | ||
| })(); | ||
| <% end %> | ||
| <% end %> | ||
| <% if onetrust_enabled? %> | ||
| <!-- Onetrust Script --> | ||
| <script async src="https://cdn.cookielaw.org/consent/e231efa5-3ed9-4b92-96bc-f4c0872ca486/otSDKStub.js" type="text/javascript" charset="UTF-8" data-domain-script="e231efa5-3ed9-4b92-96bc-f4c0872ca486" onerror="oneTrustHelper.gtmFallback()"></script> | ||
| <% end %> | ||
| <% if gtm_enabled? && Settings.gtm_id.present? %> | ||
| <!-- Google Tag Manager Script --> | ||
| <%= javascript_tag type: "text/plain", id: "GTMScript", class: "optanon-category-1" do %> | ||
| (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': | ||
| new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], | ||
| j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= | ||
| 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); | ||
| })(window,document,'script','dataLayer','<%= Settings.gtm_id %>'); | ||
| <% end %> | ||
| <!-- End Google Tag Manager --> | ||
| <% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.