Skip to content

Commit 541224b

Browse files
(SIMP-9758) - Remove simp_bolt-related docs (#430)
* Removed * simp_bolt docs * Fixes * links * release_mapping code * python tests * Updated sphinx * Works with FIPS mode * Better link checking Co-authored-by: lnemsick-simp <lnemsick-simp@users.noreply.github.com>
1 parent 4988cb6 commit 541224b

File tree

18 files changed

+63
-273
lines changed

18 files changed

+63
-273
lines changed

CHANGELOG

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Wed Jun 02 2021 Trevor Vaughan <tvaughan@onyxpoint.com>
2+
- Remove simp_bolt-related documentation
3+
14
* Mon Dec 08 2020 Chris Tessmer <chris.tessmer@onyxpoint.com>
25
- Announced immediate deprecation of EL6 in 6.5.0 CHANGELOG
36
- Removed references to EL6 ISO & tarball in various sections

docs/FAQ/Puppet.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,6 @@ with the same permissions and ownership.
158158

159159
.. _SERVER-94: https://tickets.puppetlabs.com/browse/SERVER-94
160160
.. _postrun: https://github.com/puppetlabs/r10k/blob/master/doc/dynamic-environments/configuration.mkd#postrun
161-
.. _generate_types: https://github.com/puppetlabs/r10k/blob/master/doc/dynamic-environments/configuration.mkd#generate_types
162-
.. _"generate_types" option: https://github.com/puppetlabs/r10k/blob/master/doc/dynamic-environments/configuration.mkd#generate_types
161+
.. _generate_types: https://github.com/puppetlabs/r10k/blob/main/doc/dynamic-environments/configuration.mkd#generate_types
162+
.. _"generate_types" option: https://github.com/puppetlabs/r10k/blob/main/doc/dynamic-environments/configuration.mkd#generate_types
163163
.. _Puppet Environment isolation: https://puppet.com/docs/puppet/5.5/environment_isolation.html

docs/HOWTO/00_Accounts_and_Access/Redundant_LDAP.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ described in the :ref:`User_Management`.
9999
.. NOTE::
100100

101101
Information on how the create salted ({SSHA}) passwords can be found at the
102-
`OpenLDAP site <www.openldap.org/faq/data/cache/347.html>`__.
102+
`OpenLDAP site <https://www.openldap.org/faq/data/cache/347.html>`__.
103103

104104
Set up the Redundant (Consumer) Servers
105105
---------------------------------------

docs/HOWTO/20_Puppet/Bolt.rst

-214
This file was deleted.

docs/changelogs/6.0.0_Changelog.rst

+37-37
Original file line numberDiff line numberDiff line change
@@ -178,43 +178,43 @@ in the module.
178178

179179
New catalysts are as follows:
180180

181-
- simp_options::auditd
182-
- simp_options::clamav
183-
- simp_options::dns::search
184-
- simp_options::dns::servers
185-
- simp_options::firewall
186-
- simp_options::haveged
187-
- simp_options::ipsec
188-
- simp_options::kerberos
189-
- simp_options::ldap
190-
- simp_options::ldap::base_dn
191-
- simp_options::ldap::bind_dn
192-
- simp_options::ldap::bind_hash
193-
- simp_options::ldap::bind_pw
194-
- simp_options::ldap::master
195-
- simp_options::ldap::root_dn
196-
- simp_options::ldap::sync_dn
197-
- simp_options::ldap::sync_hash
198-
- simp_options::ldap::sync_pw
199-
- simp_options::ldap::uri
200-
- simp_options::logrotate
201-
- simp_options::ntpd::servers
202-
- simp_options::openssl::cipher_suite
203-
- simp_options::pam
204-
- simp_options::pki
205-
- simp_options::pki::source
206-
- simp_options::puppet::ca
207-
- simp_options::puppet::ca_port
208-
- simp_options::puppet::server
209-
- simp_options::puppet::server_distribution
210-
- simp_options::selinux
211-
- simp_options::sssd
212-
- simp_options::stunnel
213-
- simp_options::syslog
214-
- simp_options::syslog::failover_log_servers
215-
- simp_options::syslog::log_servers
216-
- simp_options::tcpwrappers
217-
- simp_options::trusted_nets
181+
- ``simp_options::auditd``
182+
- ``simp_options::clamav``
183+
- ``simp_options::dns::search``
184+
- ``simp_options::dns::servers``
185+
- ``simp_options::firewall``
186+
- ``simp_options::haveged``
187+
- ``simp_options::ipsec``
188+
- ``simp_options::kerberos``
189+
- ``simp_options::ldap``
190+
- ``simp_options::ldap::base_dn``
191+
- ``simp_options::ldap::bind_dn``
192+
- ``simp_options::ldap::bind_hash``
193+
- ``simp_options::ldap::bind_pw``
194+
- ``simp_options::ldap::master``
195+
- ``simp_options::ldap::root_dn``
196+
- ``simp_options::ldap::sync_dn``
197+
- ``simp_options::ldap::sync_hash``
198+
- ``simp_options::ldap::sync_pw``
199+
- ``simp_options::ldap::uri``
200+
- ``simp_options::logrotate``
201+
- ``simp_options::ntpd::servers``
202+
- ``simp_options::openssl::cipher_suite``
203+
- ``simp_options::pam``
204+
- ``simp_options::pki``
205+
- ``simp_options::pki::source``
206+
- ``simp_options::puppet::ca``
207+
- ``simp_options::puppet::ca_port``
208+
- ``simp_options::puppet::server``
209+
- ``simp_options::puppet::server_distribution``
210+
- ``simp_options::selinux``
211+
- ``simp_options::sssd``
212+
- ``simp_options::stunnel``
213+
- ``simp_options::syslog``
214+
- ``simp_options::syslog::failover_log_servers``
215+
- ``simp_options::syslog::log_servers``
216+
- ``simp_options::tcpwrappers``
217+
- ``simp_options::trusted_nets``
218218

219219
Strong Parameter Typing
220220
"""""""""""""""""""""""

docs/changelogs/6.4.0_Changelog.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ pupmod-simp-ssh
10371037
public keys in Hiera.
10381038
* Added multiple port support
10391039

1040-
- The ssh::server::conf::port entry can now take an Array of ports
1040+
- The ``ssh::server::conf::port`` entry can now take an Array of ports
10411041
- ``selinux_port`` resources are created for each non-standard entry
10421042

10431043
pupmod-simp-sssd

docs/changelogs/latest.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ Puppet 3 Functions Removed from simp/simplib
277277
| :code:`validate_uri_list` | :code:`simplib::validate_sysctl_value` | :pupmod:`simp/simplib` >= 3.7.0 |
278278
+----------------------------------+--------------------------------------------+-----------------------------------+
279279

280-
.. _in: https://puppet.com/docs/puppet/6.18/lang_expressions.html#in
281-
.. _+ (concatenation): https://puppet.com/docs/puppet/6.18/lang_expressions.html#+-(concatenation)
280+
.. _in: https://puppet.com/docs/puppet/6/lang_expressions.html#in
281+
.. _+ (concatenation): https://puppet.com/docs/puppet/6/lang_expressions.html#+-(concatenation)
282282

283283
Puppet 3 Functions Removed from simp/ssh
284284
""""""""""""""""""""""""""""""""""""""""

docs/conflib/release_mapping.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ def get_version_map(simp_branch, local_simp_core_path, simp_github_api_base,
9393
release_yaml = __yaml_load(release_yaml_string)
9494
break
9595

96-
__update_ver_map(ver_map, release_yaml)
96+
if isinstance(release_yaml, dict):
97+
__update_ver_map(ver_map, release_yaml)
9798

9899
except urllib.error.HTTPError as e:
99100
print('Error downloading ' + url, file=sys.stderr)

docs/conflib/release_mapping_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def build_single_release_mappings_yaml(local_simp_core_path):
5555
build_command: 'bundle exec rake build:auto[5.2.1-0,RedHat-7-x86_64-DVD-1511.iso]'
5656
os_version: '7.2'
5757
"""
58-
mappings_file = open(os.path.join(build_path, 'release_mappings.yaml'), 'w', 0)
58+
mappings_file = open(os.path.join(build_path, 'release_mappings.yaml'), 'w')
5959
mappings_file.write(content)
6060
mappings_file.close
6161

docs/contributors_guide/Contribution_Procedure.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,16 @@ releasing a full update. These may be added to the unstable ``master`` branch
196196
without testing but tests should be added if the changes will be released in
197197
the future.
198198

199-
.. _Allow edits from maintainers: https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork
200-
.. _GitHub GUI to fork and clone: https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/fork-a-repo
199+
.. _Allow edits from maintainers: https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork
200+
.. _GitHub GUI to fork and clone: https://docs.github.com/en/github/getting-started-with-github/quickstart/fork-a-repo
201201
.. _GitHub Workflow: https://guides.github.com/introduction/flow/
202202
.. _JIRA Smart Commit Tags: https://support.atlassian.com/bitbucket-cloud/docs/use-smart-commits/
203203
.. _JIRA issues can be referenced: https://support.atlassian.com/bitbucket-cloud/docs/use-smart-commits/
204204
.. _SIMP JIRA: https://simp-project.atlassian.net
205205
.. _Squash and Merge: https://github.blog/2016-04-01-squash-your-commits/
206206
.. _TravisCI: https://travis-ci.com/simp
207207
.. _feature branch: https://www.atlassian.com/git/tutorials/comparing-workflows#feature-branch-workflow
208-
.. _pull request: https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/about-pull-requests
209-
.. _review: https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/reviewing-proposed-changes-in-a-pull-request
208+
.. _pull request: https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
209+
.. _review: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request
210210
.. _simp-doc: https://github.com/simp/simp-doc
211211
.. _squash: https://github.blog/2016-04-01-squash-your-commits/

docs/contributors_guide/maintenance/Amending_Pull_Requests.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ Amending Changes to Submitted Pull Requests
4242
#. The pull request has been updated, and participants have received an email
4343

4444
.. _hub: https://hub.github.com/
45-
.. _protected branches: https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/about-protected-branches
45+
.. _protected branches: https://docs.github.com/en/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches

docs/contributors_guide/maintenance/iso_release_procedures/Pre_Release_Checklist.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ To verify that the ``simp-core`` acceptance tests have succeeded
194194
If the GitLab instance for ``simp-core`` is current (it is sync'd
195195
every 3 hours), you can look at the latest acceptance test results
196196
run by GitLab, instead. The results will be at
197-
https://gitlab.com/simp/simp-core/pipelines.
197+
https://gitlab.com/simp/simp-core/-/pipelines.
198198

199199

200200
Verify ISOs can be created

0 commit comments

Comments
 (0)