Skip to content

Commit abe76f3

Browse files
Merge pull request #1366 from imm0rtalsupp0rt/docs-maint
Fixing links and errors and removing outdated info
2 parents 3f418d1 + bb38478 commit abe76f3

4 files changed

Lines changed: 39 additions & 62 deletions

File tree

src/components/docs/ConfigurationManagers.mdx

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,40 @@ import Callout from '@choco-astro/components/Callout.astro';
55
import Iframe from '@choco-astro/components/Iframe.astro';
66
import Xref from '@components/Xref.astro';
77

8-
For common integrations, it's handy to refer to the table below to know what configuration manager to choose. Most of the implementations below are written and managed by the companies behind the product. These implementations are typically open source and each part could be added by community contributions for those familiar with the code implementations. If you are unable to provide code implementations for adding necessary functionality to the integrations, we find it best if you create issues/tickets with those organizations if you are a customer as you will have more leverage into getting them implemented.
8+
For common integrations, it's handy to refer to the table below to know what configuration manager to choose. Most of these implementations are written and managed by the organizations behind the product and are typically open source. Each part could be added by community contributions for those familiar with the code implementations. If you are unable to provide code implementations for adding necessary functionality to the integrations, we find it best if you create issues/tickets with those organizations if you are a customer as you will have more leverage in getting them implemented.
99

1010
<Callout type="info">
1111
If you are a configuration manager company identified in the table and you have implemented anything in the below or you find our information is incorrect, please let us know so we can get it fixed.
1212
</Callout>
1313

14-
| Configuration Managers | [Ansible][ansible_main] | [Chef][chef_main] | [PowerShell DSC][dsc_main] | [Puppet][pp_main] | [Salt][salt_main] | [Otter][otter_main] |
15-
|-----------------------------------------------------|-------------------------|--------------------|----------------------------|-------------------|-------------------|---------------------|
16-
| Manage Packages | [x][ansible_main] | [x][chef_main] | [x][dsc_pkgs] | [x][pp_pkgs] | [x][salt_pkgs] | [x][otter_pkgs] |
17-
| <Xref title="Install Chocolatey" value="setup-choco" /> | [x][ansible_main] | [x][chef_cookbook] | [x][dsc_install] | [x][pp_install] | [x][salt_install] | [x][otter_install] |
18-
| Install Chocolatey from internal source | [x][ansible_main] | [x][chef_cookbook] | [x][dsc_install] | [x][pp_install] | | [x][otter_install] |
19-
| <Xref title="Manage Sources" value="choco-command-source" /> | [x][ansible_source] | [x][chef_source] | [x][dsc_source] | [x][pp_source] | [x][salt_source] | [x][otter_source] |
20-
| Manage Source Type (Admin/Self-Service) | [x][ansible_source] | | | [x][pp_source] | | |
21-
| <Xref title="Manage Features" value="choco-command-feature" /> | [x][ansible_feature] | | [x][dsc_feature] | [x][pp_feature] | | [x][otter_feature] |
22-
| <Xref title="Manage Config Settings" value="choco-command-config" /> | [x][ansible_config] | [x][chef_config] | | [x][pp_config] | | |
14+
| Configuration Managers | [Ansible][ansible_main] | [Chef][chef_main] | [Puppet][pp_main] | [Salt][salt_main] | [BuildMaster/Otter][otter_main] |
15+
|-------------------------------------------------------------------------------|-------------------------|--------------------|-------------------|-------------------|---------------------------------|
16+
| Manage Packages | [x][ansible_manage] | [x][chef_manage] | [x][pp_pkgs] | [x][salt_main] | [x][otter_pkgs] |
17+
| <Xref title="Install Chocolatey" value="setup-choco" /> | [x][ansible_main] | [x][chef_main] | [x][pp_install] | [x][salt_main] | [x][otter_install] |
18+
| Install Chocolatey from internal source | [x][ansible_main] | [x][chef_main] | [x][pp_install] | | [x][otter_install] |
19+
| <Xref title="Manage Sources" value="choco-command-source" /> | [x][ansible_source] | [x][chef_source] | [x][pp_source] | [x][salt_main] | [x][otter_source] |
20+
| Manage Source Type (Admin/Self-Service) | [x][ansible_source] | [x][chef_source] | [x][pp_source] | | |
21+
| <Xref title="Manage Features" value="choco-command-feature" /> | [x][ansible_feature] | [x][chef_feature] | [x][pp_feature] | | [x][otter_feature] |
22+
| <Xref title="Manage Config Settings" value="choco-command-config" /> | [x][ansible_config] | [x][chef_config] | [x][pp_config] | | |
2323

2424
<Callout type="info">
2525
Each *x* is linked to the specific feature documentation.
2626
</Callout>
2727

2828
For most of these, those configuration managers have some sort of exec you could use to manage those additional aspects, but it would be best if they supported all aspects of configuration of Chocolatey as part of the provider implementations.
2929

30-
[ansible_main]:https://docs.ansible.com/ansible/latest/modules/win_chocolatey_module.html
31-
[ansible_source]: https://docs.ansible.com/ansible/latest/modules/win_chocolatey_source_module.html
32-
[ansible_feature]:https://docs.ansible.com/ansible/latest/modules/win_chocolatey_feature_module.html
33-
[ansible_config]:https://docs.ansible.com/ansible/latest/modules/win_chocolatey_config_module.html
30+
[ansible_main]:https://docs.ansible.com/projects/ansible/latest/collections/chocolatey/chocolatey/index.html
31+
[ansible_source]: https://docs.ansible.com/projects/ansible/latest/collections/chocolatey/chocolatey/win_chocolatey_source_module.html#ansible-collections-chocolatey-chocolatey-win-chocolatey-source-module
32+
[ansible_feature]:https://docs.ansible.com/projects/ansible/latest/collections/chocolatey/chocolatey/win_chocolatey_feature_module.html#ansible-collections-chocolatey-chocolatey-win-chocolatey-feature-module
33+
[ansible_config]:https://docs.ansible.com/projects/ansible/latest/collections/chocolatey/chocolatey/win_chocolatey_config_module.html#ansible-collections-chocolatey-chocolatey-win-chocolatey-config-module
34+
[ansible_manage]:https://docs.ansible.com/projects/ansible/latest/collections/chocolatey/chocolatey/win_chocolatey_module.html#ansible-collections-chocolatey-chocolatey-win-chocolatey-module
3435

35-
[chef_main]:https://docs.chef.io/resource_chocolatey_package.html
36+
[chef_main]:https://docs.chef.io/client/19/resources/bundled/chocolatey_installer/
3637
[chef_cookbook]:https://supermarket.chef.io/cookbooks/chocolatey/
37-
[chef_source]:https://docs.chef.io/resource_chocolatey_source.html
38-
[chef_config]:https://docs.chef.io/resource_chocolatey_config.html
38+
[chef_source]:https://docs.chef.io/client/19/resources/bundled/chocolatey_source/
39+
[chef_config]:https://docs.chef.io/client/19/resources/bundled/chocolatey_config/
40+
[chef_feature]:https://docs.chef.io/client/19/resources/bundled/chocolatey_feature/
41+
[chef_manage]:https://docs.chef.io/client/19/resources/bundled/chocolatey_package/
3942

4043
[dsc_main]:https://www.powershellgallery.com/packages/cChoco
4144
[dsc_pkgs]:https://github.com/chocolatey/cChoco/blob/development/DSCResources/cChocoPackageInstall/cChocoPackageInstall.schema.mof
@@ -44,18 +47,18 @@ For most of these, those configuration managers have some sort of exec you could
4447
[dsc_feature]:https://github.com/chocolatey/cChoco/blob/master/DSCResources/cChocoFeature/cChocoFeature.schema.mof
4548

4649
[pp_main]:https://forge.puppet.com/puppetlabs/chocolatey
47-
[pp_pkgs]:https://forge.puppet.com/puppetlabs/chocolatey#package-provider-chocolatey
48-
[pp_install]:https://forge.puppet.com/puppetlabs/chocolatey#class-chocolatey
49-
[pp_source]:https://forge.puppet.com/puppetlabs/chocolatey#chocolateysource
50-
[pp_feature]:https://forge.puppet.com/puppetlabs/chocolatey#chocolateyfeature
51-
[pp_config]:https://forge.puppet.com/puppetlabs/chocolatey#chocolateyconfig
50+
[pp_pkgs]:https://forge.puppet.com/modules/puppetlabs/chocolatey/readme#packages
51+
[pp_install]:https://forge.puppet.com/modules/puppetlabs/chocolatey/readme#manage-chocolatey-installation
52+
[pp_source]:https://forge.puppet.com/modules/puppetlabs/chocolatey/readme#sources-configuration
53+
[pp_feature]:https://forge.puppet.com/modules/puppetlabs/chocolatey/readme#features-configuration
54+
[pp_config]:https://forge.puppet.com/modules/puppetlabs/chocolatey/readme#config-configuration
5255

53-
[salt_main]:https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.chocolatey.html
56+
[salt_main]:https://docs.saltproject.io/en/latest/ref/modules/all/salt.modules.chocolatey.html
5457
[salt_pkgs]:https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.chocolatey.html#salt.modules.chocolatey.install
5558
[salt_install]:https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.chocolatey.html#salt.modules.chocolatey.bootstrap
5659
[salt_source]:https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.chocolatey.html#salt.modules.chocolatey.add_source
5760

58-
[otter_main]:https://inedo.com/den/inedox/chocolatey
61+
[otter_main]:https://buildmaster.inedo.com/applications/15/overview
5962
[otter_pkgs]:https://github.com/Inedo/inedox-chocolatey/blob/master/Chocolatey/InedoExtension/Configurations/ChocolateyPackageConfiguration.cs
6063
[otter_install]:https://github.com/Inedo/inedox-chocolatey/blob/master/Chocolatey/InedoExtension/Configurations/ChocolateyInstalledConfiguration.cs
6164
[otter_source]:https://github.com/Inedo/inedox-chocolatey/blob/master/Chocolatey/InedoExtension/Configurations/ChocolateySourceConfiguration.cs

src/components/docs/OrgGuideCentralManagement.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import OrgGuideCentralManagementIntro from '@components/docs/OrgGuideCentralMana
1717
import DynamicCodeBlockInput from '@choco-astro/components/dynamicCodeBlock/DynamicCodeBlockInput.astro';
1818
import DynamicCodeBlock from '@choco-astro/components/dynamicCodeBlock/DynamicCodeBlock.astro';
1919
export const ccmInstall = [
20-
{ id: 'ccm-database', title: 'Chocolatey Cental Management Database', isActive: true },
20+
{ id: 'ccm-database', title: 'Chocolatey Central Management Database', isActive: true },
2121
{ id: 'ccm-service', title: 'Chocolatey Central Management Service', updateAnchor: true },
2222
{ id: 'ccm-web', title: 'Chocolatey Central Management Website', updateAnchor: true }
2323
];

src/content/docs/en-us/features/integrations.mdx

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
---
22
order: 60
33
xref: integrations
4-
title: Integrates with everything
4+
title: Integrates With Anything
55
description: Information on how Chocolatey can integrate with almost every tool
66
---
77
import Callout from '@choco-astro/components/Callout.astro';
88
import Iframe from '@choco-astro/components/Iframe.astro';
99
import Xref from '@components/Xref.astro';
1010
import ConfigurationManagers from '@components/docs/ConfigurationManagers.mdx';
1111

12-
Chocolatey integrates with several infrastructure automation tools!
12+
## Summary
1313

14-
With most of these tools, the interface you would interact with Chocolatey would be through the tool or through the interfaces of the tool, like in scripts.
14+
Chocolatey can be used with almost every mainstream infrastructure automation tool! Some of the more popular ones are listed below.
1515

16-
## Summary
16+
With most of these tools, the interface you would interact with Chocolatey would be through the tool or through the interfaces of the tool, like in scripts.
1717

1818
### Chocolatey Integration Implementation with Common Configuration Managers
1919

@@ -29,7 +29,7 @@ win_chocolatey:
2929
source: https://my.internal.repository/api/v2/
3030
```
3131
32-
[Read More...](https://docs.ansible.com/ansible/latest/collections/chocolatey/chocolatey/win_chocolatey_source_module.html)
32+
[Read More...](https://docs.ansible.com/projects/ansible/latest/collections/chocolatey/chocolatey/index.html)
3333
3434
## Boxstarter
3535
@@ -95,13 +95,13 @@ node.default['cpe_choco']['sources']['bacon'] =
9595

9696
Octopus is a friendly deployment automation tool for .NET developers. It integrates with lots of utilities, and they have a template for installing Chocolatey packages: https://library.octopusdeploy.com/step-template/actiontemplate-chocolatey-install-package
9797

98-
[Read more...](https://octopus.com/)
98+
[Read more...](https://octopus.com/docs/runbooks/runbook-examples/routine/installing-software-chocolatey)
9999

100-
## Otter
100+
## BuildMaster/Otter
101101

102-
Otter has an [open source Chocolatey extension](https://github.com/Inedo/inedox-chocolatey) that allows installing and uninstalling packages, specifying package versions, chocolatey sources, chocolatey features, and installing chocolatey itself.
102+
Inedo has an [open source Chocolatey extension](https://github.com/Inedo/inedox-chocolatey) that allows installing and uninstalling packages, specifying package versions, Chocolatey sources, Chocolatey features, and installing Chocolatey itself.
103103

104-
Otter also keeps an inventory of Chocolatey packages installed on any or all servers.
104+
BuildMaster/Otter also keeps an inventory of Chocolatey packages installed on any or all servers.
105105

106106
```powershell
107107
Chocolatey::Ensure-Package
@@ -131,26 +131,7 @@ Chocolatey::Ensure-Feature
131131
);
132132
```
133133

134-
[Read More...](https://inedo.com/den/otter/chocolatey)
135-
136-
## PowerShell DSC
137-
138-
PowerShell DSC (Desired State Configuration) has a cChoco module that can manage both packages and the installation of Chocolatey itself.
139-
140-
```powershell
141-
cChocoInstaller installChoco
142-
{
143-
InstallDir = "c:\ProgramData\chocolatey"
144-
}
145-
146-
cChocoPackageInstaller installGit
147-
{
148-
Name = "git"
149-
DependsOn = "[cChocoInstaller]installChoco"
150-
}
151-
```
152-
153-
[Read More...](http://www.powershellgallery.com/packages/cChoco/)
134+
[Read More...](https://buildmaster.inedo.com/applications/15/overview)
154135

155136
## PowerShell PackageManagement
156137

@@ -215,7 +196,7 @@ salt '*' chocolatey.bootstrap
215196
salt '*' chocolatey.install git
216197
```
217198

218-
[Read More...](https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.chocolatey.html)
199+
[Read More...](https://docs.saltproject.io/en/latest/ref/modules/all/salt.modules.chocolatey.html)
219200

220201
## System Center Configuration Manager
221202

src/content/docs/en-us/guides/organizations/proxying-ccr.mdx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ For more information, visit Inedo ProGet's documentation on [HOWTO: Proxy Packag
5959

6060
#### JFrog Artifactory
6161

62-
<div class="callout callout-warning">
63-
<div class="callout-header">WARNING</div>
64-
<p>
65-
This does not work with the self-hosted version of Artifactory and may result in blocks for excessive usage. However, this may work in the Cloud/SaaS version. JFrog is aware that this does not work with the self-hosted version and once this has been resolved, this warning will be removed. [More information can be found here](https://jfrog.atlassian.net/browse/RTFACT-31207).
66-
</p>
67-
</div>
68-
6962
<table>
7063
<tr>
7164
<th>Repository Type</th>

0 commit comments

Comments
 (0)