puppet 5.5.1 → 5.5.2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (138) hide show
  1. checksums.yaml +7 -0
  2. data/CONTRIBUTING.md +3 -3
  3. data/README.md +2 -2
  4. data/conf/auth.conf +2 -2
  5. data/conf/environment.conf +1 -1
  6. data/conf/fileserver.conf +1 -1
  7. data/conf/puppet.conf +4 -4
  8. data/ext/README.environment +1 -1
  9. data/ext/debian/copyright +2 -2
  10. data/ext/debian/puppetmaster.README.debian +2 -2
  11. data/ext/hiera/hiera.yaml +1 -1
  12. data/ext/puppet-test +1 -1
  13. data/ext/rack/example-passenger-vhost.conf +1 -1
  14. data/ext/regexp_nodes/regexp_nodes.rb +12 -12
  15. data/ext/upload_facts.rb +1 -1
  16. data/lib/hiera/puppet_function.rb +1 -1
  17. data/lib/puppet.rb +1 -1
  18. data/lib/puppet/application/agent.rb +1 -1
  19. data/lib/puppet/application/apply.rb +1 -1
  20. data/lib/puppet/application/cert.rb +1 -1
  21. data/lib/puppet/application/device.rb +8 -8
  22. data/lib/puppet/application/lookup.rb +1 -1
  23. data/lib/puppet/application/master.rb +1 -1
  24. data/lib/puppet/application/resource.rb +1 -1
  25. data/lib/puppet/application/script.rb +1 -1
  26. data/lib/puppet/defaults.rb +22 -16
  27. data/lib/puppet/face/config.rb +1 -1
  28. data/lib/puppet/face/help/man.erb +1 -1
  29. data/lib/puppet/face/module/build.rb +3 -3
  30. data/lib/puppet/face/status.rb +2 -2
  31. data/lib/puppet/functions/all.rb +2 -2
  32. data/lib/puppet/functions/any.rb +2 -2
  33. data/lib/puppet/functions/assert_type.rb +3 -3
  34. data/lib/puppet/functions/each.rb +2 -2
  35. data/lib/puppet/functions/eyaml_lookup_key.rb +1 -1
  36. data/lib/puppet/functions/filter.rb +2 -2
  37. data/lib/puppet/functions/hiera.rb +5 -5
  38. data/lib/puppet/functions/hiera_array.rb +5 -5
  39. data/lib/puppet/functions/hiera_hash.rb +6 -6
  40. data/lib/puppet/functions/hiera_include.rb +7 -7
  41. data/lib/puppet/functions/hocon_data.rb +1 -1
  42. data/lib/puppet/functions/json_data.rb +1 -1
  43. data/lib/puppet/functions/lest.rb +1 -1
  44. data/lib/puppet/functions/lookup.rb +1 -1
  45. data/lib/puppet/functions/map.rb +1 -1
  46. data/lib/puppet/functions/match.rb +11 -0
  47. data/lib/puppet/functions/reduce.rb +1 -1
  48. data/lib/puppet/functions/reverse_each.rb +1 -1
  49. data/lib/puppet/functions/step.rb +1 -1
  50. data/lib/puppet/functions/then.rb +1 -1
  51. data/lib/puppet/functions/tree_each.rb +7 -7
  52. data/lib/puppet/functions/with.rb +4 -4
  53. data/lib/puppet/functions/yaml_data.rb +1 -1
  54. data/lib/puppet/indirector/node/exec.rb +1 -1
  55. data/lib/puppet/indirector/node/ldap.rb +1 -1
  56. data/lib/puppet/module_tool/applications/application.rb +1 -1
  57. data/lib/puppet/module_tool/skeleton/templates/generator/examples/init.pp.erb +1 -1
  58. data/lib/puppet/network/http/factory.rb +3 -0
  59. data/lib/puppet/parser/ast/pops_bridge.rb +18 -0
  60. data/lib/puppet/parser/compiler.rb +1 -1
  61. data/lib/puppet/parser/functions.rb +1 -1
  62. data/lib/puppet/parser/functions/assert_type.rb +3 -3
  63. data/lib/puppet/parser/functions/each.rb +2 -2
  64. data/lib/puppet/parser/functions/filter.rb +1 -1
  65. data/lib/puppet/parser/functions/hiera.rb +4 -4
  66. data/lib/puppet/parser/functions/hiera_array.rb +5 -5
  67. data/lib/puppet/parser/functions/hiera_hash.rb +6 -6
  68. data/lib/puppet/parser/functions/hiera_include.rb +10 -11
  69. data/lib/puppet/parser/functions/inline_template.rb +1 -1
  70. data/lib/puppet/parser/functions/lest.rb +1 -1
  71. data/lib/puppet/parser/functions/lookup.rb +1 -1
  72. data/lib/puppet/parser/functions/map.rb +1 -1
  73. data/lib/puppet/parser/functions/reduce.rb +1 -1
  74. data/lib/puppet/parser/functions/reverse_each.rb +1 -1
  75. data/lib/puppet/parser/functions/step.rb +1 -1
  76. data/lib/puppet/parser/functions/then.rb +1 -1
  77. data/lib/puppet/parser/functions/with.rb +4 -4
  78. data/lib/puppet/pops/types/types.rb +8 -4
  79. data/lib/puppet/provider/user/aix.rb +1 -1
  80. data/lib/puppet/reference/providers.rb +1 -1
  81. data/lib/puppet/reference/report.rb +1 -1
  82. data/lib/puppet/resource/capability_finder.rb +1 -1
  83. data/lib/puppet/resource/catalog.rb +2 -2
  84. data/lib/puppet/resource/type.rb +6 -2
  85. data/lib/puppet/settings/config_file.rb +1 -1
  86. data/lib/puppet/settings/environment_conf.rb +10 -1
  87. data/lib/puppet/ssl/certificate_authority.rb +2 -2
  88. data/lib/puppet/transaction/report.rb +1 -2
  89. data/lib/puppet/type.rb +12 -12
  90. data/lib/puppet/type/file/content.rb +15 -2
  91. data/lib/puppet/type/file/ensure.rb +1 -1
  92. data/lib/puppet/type/schedule.rb +1 -1
  93. data/lib/puppet/type/stage.rb +1 -1
  94. data/lib/puppet/version.rb +1 -1
  95. data/locales/ja/puppet.po +179 -148
  96. data/locales/puppet.pot +139 -115
  97. data/man/man5/puppet.conf.5 +16 -16
  98. data/man/man8/puppet-agent.8 +2 -2
  99. data/man/man8/puppet-apply.8 +2 -2
  100. data/man/man8/puppet-ca.8 +3 -3
  101. data/man/man8/puppet-catalog.8 +2 -2
  102. data/man/man8/puppet-cert.8 +2 -2
  103. data/man/man8/puppet-certificate.8 +3 -3
  104. data/man/man8/puppet-certificate_request.8 +2 -2
  105. data/man/man8/puppet-certificate_revocation_list.8 +2 -2
  106. data/man/man8/puppet-config.8 +3 -3
  107. data/man/man8/puppet-describe.8 +1 -1
  108. data/man/man8/puppet-device.8 +2 -2
  109. data/man/man8/puppet-doc.8 +1 -1
  110. data/man/man8/puppet-epp.8 +2 -2
  111. data/man/man8/puppet-facts.8 +2 -2
  112. data/man/man8/puppet-filebucket.8 +1 -1
  113. data/man/man8/puppet-generate.8 +2 -2
  114. data/man/man8/puppet-help.8 +2 -2
  115. data/man/man8/puppet-key.8 +2 -2
  116. data/man/man8/puppet-lookup.8 +2 -2
  117. data/man/man8/puppet-man.8 +2 -2
  118. data/man/man8/puppet-master.8 +2 -2
  119. data/man/man8/puppet-module.8 +4 -4
  120. data/man/man8/puppet-node.8 +2 -2
  121. data/man/man8/puppet-parser.8 +2 -2
  122. data/man/man8/puppet-plugin.8 +2 -2
  123. data/man/man8/puppet-report.8 +2 -2
  124. data/man/man8/puppet-resource.8 +2 -2
  125. data/man/man8/puppet-script.8 +2 -2
  126. data/man/man8/puppet-status.8 +3 -3
  127. data/man/man8/puppet.8 +2 -2
  128. data/spec/integration/type/file_spec.rb +30 -0
  129. data/spec/unit/defaults_spec.rb +14 -0
  130. data/spec/unit/environments_spec.rb +40 -0
  131. data/spec/unit/face/module/build_spec.rb +2 -2
  132. data/spec/unit/functions/match_spec.rb +18 -0
  133. data/spec/unit/functions/new_spec.rb +1 -0
  134. data/spec/unit/network/http/factory_spec.rb +35 -28
  135. data/spec/unit/resource/type_spec.rb +22 -6
  136. data/spec/unit/type/file/content_spec.rb +12 -0
  137. data/spec/unit/type/file/source_spec.rb +8 -2
  138. metadata +3628 -3640
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 150276769f3f7d3b0d1144c7cc955ec30ef7079f
4
+ data.tar.gz: 2c346495b89018f0040fd15dac9ceea9972bc241
5
+ SHA512:
6
+ metadata.gz: c145fc602f225f17256e87cf111da9350a28ae59e9f2574d5e6fbdaeb452f7015ac4c19ca79d87eeaaf40d57298b3e1447779662d2c4b5fa5eb8a20d6249389c
7
+ data.tar.gz: 05a8ba3218ee7ad635005adfe67ade21b9df1e55a57dcf7c01f82783fdcd59e9687d3efb1feec476bc6ddb6c43a6409618f10d859a0fef0b868aed6ff0d07e52
@@ -32,7 +32,7 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
32
32
  * Submit a Jira ticket for your issue if one does not already exist.
33
33
  * Clearly describe the issue including steps to reproduce when it is a bug.
34
34
  * Make sure you fill in the earliest version that you know has the issue.
35
- * A ticket is not necessary for [trivial changes](https://docs.puppet.com/community/trivial_patch_exemption.html)
35
+ * A ticket is not necessary for [trivial changes](https://puppet.com/community/trivial-patch-exemption-policy)
36
36
  * Fork the repository on GitHub.
37
37
 
38
38
  ## Making Changes
@@ -90,7 +90,7 @@ user-facing strings are marked in new PRs before merging.
90
90
 
91
91
  ## Making Trivial Changes
92
92
 
93
- For [changes of a trivial nature](https://docs.puppet.com/community/trivial_patch_exemption.html), it is not always necessary to create a new
93
+ For [changes of a trivial nature](https://puppet.com/community/trivial-patch-exemption-policy), it is not always necessary to create a new
94
94
  ticket in Jira. In this case, it is appropriate to start the first line of a
95
95
  commit with one of `(docs)`, `(maint)`, or `(packaging)` instead of a ticket
96
96
  number.
@@ -160,7 +160,7 @@ ensure the issue has been resolved.
160
160
 
161
161
  ## Additional Resources
162
162
 
163
- * [Puppet community guidelines](https://docs.puppet.com/community/community_guidelines.html)
163
+ * [Puppet community guidelines](https://puppet.com/community/community-guidelines)
164
164
  * [Bug tracker (Jira)](https://tickets.puppetlabs.com)
165
165
  * [Contributor License Agreement](http://links.puppet.com/cla)
166
166
  * [General GitHub documentation](https://help.github.com/)
data/README.md CHANGED
@@ -18,7 +18,7 @@ Documentation for Puppet and related projects can be found online at the
18
18
 
19
19
  HTTP API
20
20
  --------
21
- [HTTP API Index](https://puppet.com/docs/puppet/5.4/http_api/http_api_index.html)
21
+ [HTTP API Index](https://puppet.com/docs/puppet/5.5/http_api/http_api_index.html)
22
22
 
23
23
  Installation
24
24
  ------------
@@ -28,7 +28,7 @@ which also includes orchestration features, a web console, and professional supp
28
28
  The PE documentation is [available here.](https://puppet.com/docs/pe/latest)
29
29
 
30
30
  To install an open source release of Puppet,
31
- [see the installation guide on the docs site.](http://puppet.com/docs/puppet/5.4/install_pre.html)
31
+ [see the installation guide on the docs site.](https://puppet.com/docs/puppet/5.5/install_pre.html)
32
32
 
33
33
  If you need to run Puppet from source as a tester or developer,
34
34
  see the [Running Puppet from Source](https://docs.puppet.com/puppet/3.8/from_source.html) guide on the docs site.
@@ -7,7 +7,7 @@
7
7
  # otherwise, the general rules may "steal" requests that should be
8
8
  # governed by the specific rules.
9
9
  #
10
- # See https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html
10
+ # See https://puppet.com/docs/puppet/latest/config_file_auth.html
11
11
  # for a more complete description of auth.conf's behavior.
12
12
  #
13
13
  # Supported syntax:
@@ -64,7 +64,7 @@
64
64
  # file access in auth.conf by controlling the /file_metadata(s)/<mount point>,
65
65
  # /file_content(s)/<mount point>, and /static_file_content/<file> paths. See the
66
66
  # Puppet Server documentation at
67
- # https://docs.puppet.com/puppetserver/latest/config_file_auth.html.
67
+ # https://puppet.com/docs/puppetserver/latest/config_file_auth.html.
68
68
  #
69
69
  # If you are not using Puppet Server, or are using Puppet Server but with the
70
70
  # "jruby-puppet.use-legacy-auth-conf" setting set to "true", you could set the
@@ -1,6 +1,6 @@
1
1
  # Each environment can have an environment.conf file. Its settings will only
2
2
  # affect its own environment. See docs for more info:
3
- # https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html
3
+ # https://puppet.com/docs/puppet/latest/config_file_environment.html
4
4
 
5
5
  # Any unspecified settings use default values; some of those defaults are based
6
6
  # on puppet.conf settings.
@@ -34,4 +34,4 @@
34
34
  #
35
35
  # For details and an example, see the auth.conf file. If you're using Puppet
36
36
  # Server, see the Puppet Server documentation at
37
- # https://docs.puppet.com/puppetserver/latest/config_file_auth.html.
37
+ # https://puppet.com/docs/puppetserver/latest/config_file_auth.html.
@@ -1,6 +1,6 @@
1
1
  # This file can be used to override the default puppet settings.
2
2
  # See the following links for more details on what settings are available:
3
- # - https://docs.puppetlabs.com/puppet/latest/reference/config_important_settings.html
4
- # - https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
5
- # - https://docs.puppetlabs.com/puppet/latest/reference/config_file_main.html
6
- # - https://docs.puppetlabs.com/puppet/latest/reference/configuration.html
3
+ # - https://puppet.com/docs/puppet/latest/config_important_settings.html
4
+ # - https://puppet.com/docs/puppet/latest/config_about_settings.html
5
+ # - https://puppet.com/docs/puppet/latest/config_file_main.html
6
+ # - https://puppet.com/docs/puppet/latest/configuration.html
@@ -5,4 +5,4 @@ modules that are installed globally (normally in /etc/puppetlabs/code/modules) f
5
5
  puppet master.
6
6
 
7
7
  For more information see
8
- https://docs.puppet.com/puppet/latest/reference/environments.html
8
+ https://puppet.com/docs/puppet/latest/environments_about.html
@@ -7,13 +7,13 @@ Maintainer:
7
7
  Nigel Kersten <nigel@explanatorygap.net>,
8
8
  Stig Sandbeck Mathisen <ssm@debian.org>
9
9
  Source: git://github.com/puppetlabs/puppet.git,
10
- https://docs.puppetlabs.com/puppet/latest/reference/install_pre.html
10
+ https://puppet.com/docs/puppet/latest/install_pre.html
11
11
 
12
12
  Copyright: 2005-2015 Puppet Labs
13
13
  License: Apache 2.0
14
14
 
15
15
  Files: debian/*
16
- Copyright:
16
+ Copyright:
17
17
  Andrew Pollock <apollock@debian.org>,
18
18
  Jamie Wilkinson <jaq@debian.org>,
19
19
  Matthew Palmer <mpalmer@debian.org>,
@@ -11,7 +11,7 @@ To run Passenger with Apache, install the puppetmaster-passenger package. It
11
11
  automatically sets up an apache2 virtual host that runs puppetmaster under
12
12
  Passenger.
13
13
 
14
- For more information, see https://docs.puppetlabs.com/guides/passenger.html.
14
+ For more information, see https://puppet.com/docs/puppet/latest/passenger.html.
15
15
  For information about the Puppet-designed Puppet Server, which deprecates
16
16
  the Passenger/Apache stack, see
17
- https://docs.puppetlabs.com/puppetserver/latest/.
17
+ https://puppet.com/docs/puppetserver/latest/.
@@ -4,7 +4,7 @@ defaults:
4
4
  # The default value for "datadir" is "data" under the same directory as the hiera.yaml
5
5
  # file (this file)
6
6
  # When specifying a datadir, make sure the directory exists.
7
- # See https://docs.puppet.com/puppet/latest/environments.html for further details on environments.
7
+ # See https://puppet.com/docs/puppet/latest/environments_about.html for further details on environments.
8
8
  # datadir: data
9
9
  # data_hash: yaml_data
10
10
  hierarchy:
@@ -23,7 +23,7 @@
23
23
  # parameter, so you can specify '--server <servername>' as an argument.
24
24
  #
25
25
  # See the configuration file documentation at
26
- # https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
26
+ # https://puppet.com/docs/puppet/latest/config_about_settings.html
27
27
  # for the full list of acceptable parameters. A commented list of all
28
28
  # configuration $options can also be generated by running puppetd with
29
29
  # '--genconfig'.
@@ -1,6 +1,6 @@
1
1
  # This Apache 2 virtual host config shows how to use Puppet as a Rack
2
2
  # application via Passenger. See
3
- # https://docs.puppetlabs.com/guides/passenger.html for more information.
3
+ # https://puppet.com/docs/puppet/latest/passenger.html for more information.
4
4
 
5
5
  # You can also use the included config.ru file to run Puppet with other Rack
6
6
  # servers instead of Passenger.
@@ -2,24 +2,24 @@
2
2
 
3
3
  # = Synopsis
4
4
  # This is an external node classifier script, after
5
- # https://docs.puppetlabs.com/guides/external_nodes.html
5
+ # https://puppet.com/docs/puppet/latest/lang_write_functions_in_puppet.html
6
6
  #
7
7
  # = Usage
8
8
  # regexp_nodes.rb <host>
9
9
  #
10
10
  # = Description
11
11
  # This classifier implements filesystem autoloading: It looks through classes,
12
- # parameters, and environment subdirectories, looping through each file it
13
- # finds. Each file's contents are a regexp-per-line which, if they match the
14
- # hostname passed to the program as ARGV[0], sets a class, parameter value
12
+ # parameters, and environment subdirectories, looping through each file it
13
+ # finds. Each file's contents are a regexp-per-line which, if they match the
14
+ # hostname passed to the program as ARGV[0], sets a class, parameter value
15
15
  # or environment named the same thing as the file itself. At the end, the
16
- # resultant data structure is returned back to the puppet master process as
16
+ # resultant data structure is returned back to the puppet master process as
17
17
  # yaml.
18
18
  #
19
19
  # = Caveats
20
20
  # Since the files are read in directory order, multiple matches for a given
21
21
  # hostname in the parameters/ and environment/ subdirectories will return the
22
- # last-read value. (Multiple classes/ matches don't cause a problem; the
22
+ # last-read value. (Multiple classes/ matches don't cause a problem; the
23
23
  # class is either incuded or it isn't)
24
24
  #
25
25
  # Unmatched hostnames in any of the environment/ files will cause 'production'
@@ -28,10 +28,10 @@
28
28
  #
29
29
  # = Examples
30
30
  # Based on the example files in the classes/ and parameters/ subdirectories
31
- # in the distribution, classes/database will set the 'database' class for
32
- # hosts matching %r{db\d{2}} (that is, 'db' followed by two digits) or with
33
- # 'mysql' anywhere in the hostname. Similarly, hosts beginning with 'www' or
34
- # 'web' or the hostname 'leterel' (my workstation) will be assigned the
31
+ # in the distribution, classes/database will set the 'database' class for
32
+ # hosts matching %r{db\d{2}} (that is, 'db' followed by two digits) or with
33
+ # 'mysql' anywhere in the hostname. Similarly, hosts beginning with 'www' or
34
+ # 'web' or the hostname 'leterel' (my workstation) will be assigned the
35
35
  # 'webserver' class.
36
36
  #
37
37
  # Under parameters/ there is one subdirectory 'service' which
@@ -42,7 +42,7 @@
42
42
  #
43
43
  # In the environment/ subdirectory, any hosts matching '^dev-' and a single
44
44
  # production host which serves as 'canary in the coal mine' will be put into
45
- # the development environment
45
+ # the development environment
46
46
  #
47
47
  # = Author
48
48
  # Eric Sorenson <eric@explosive.net>
@@ -186,7 +186,7 @@ class ExternalNode
186
186
  end
187
187
  end
188
188
 
189
- # match_environment is similar to match_classes but it overwrites
189
+ # match_environment is similar to match_classes but it overwrites
190
190
  # any previously set value (usually just the default, 'production')
191
191
  # with a match
192
192
  def match_environment(fullpath)
@@ -58,7 +58,7 @@ is also a valid long argument. For example, 'server' is a valid configuration
58
58
  parameter, so you can specify '--server <servername>' as an argument.
59
59
 
60
60
  See the configuration file documentation at
61
- https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for
61
+ https://puppet.com/docs/puppet/latest/configuration.html for
62
62
  the full list of acceptable parameters. A commented list of all
63
63
  configuration options can also be generated by running puppet agent with
64
64
  '--genconfig'.
@@ -62,7 +62,7 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
62
62
  unless Puppet[:strict] == :off
63
63
  #TRANSLATORS 'lookup' is a puppet function and should not be translated
64
64
  message = _("The function '%{class_name}' is deprecated in favor of using 'lookup'.") % { class_name: self.class.name }
65
- message += ' '+ _("See https://docs.puppet.com/puppet/%{minor_version}/reference/deprecated_language.html") %
65
+ message += ' '+ _("See https://puppet.com/docs/puppet/%{minor_version}/deprecated_language.html") %
66
66
  { minor_version: Puppet.minor_version }
67
67
  Puppet.warn_once('deprecations', self.class.name, message)
68
68
  end
@@ -127,7 +127,7 @@ module Puppet
127
127
  # Now that settings are loaded we have the code loaded to be able to issue
128
128
  # deprecation warnings. Warn if we're on a deprecated ruby version.
129
129
  if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION)
130
- Puppet.deprecation_warning(_("Support for ruby version %{version} is deprecated and will be removed in a future release. See https://docs.puppet.com/puppet/latest/system_requirements.html#ruby for a list of supported ruby versions.") % { version: RUBY_VERSION })
130
+ Puppet.deprecation_warning(_("Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions.") % { version: RUBY_VERSION })
131
131
  end
132
132
 
133
133
  # Initialize puppet's settings. This is intended only for use by external tools that are not
@@ -166,7 +166,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
166
166
  '--setting' and '--no-setting' pairs.
167
167
 
168
168
  See the configuration file documentation at
169
- https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
169
+ https://puppet.com/docs/puppet/latest/configuration.html for the
170
170
  full list of acceptable settings. A commented list of all settings can also be
171
171
  generated by running puppet agent with '--genconfig'.
172
172
 
@@ -78,7 +78,7 @@ valid setting, so you can specify '--tags <class>,<tag>'
78
78
  as an argument.
79
79
 
80
80
  See the configuration file documentation at
81
- https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
81
+ https://puppet.com/docs/puppet/latest/configuration.html for the
82
82
  full list of acceptable parameters. A commented list of all
83
83
  configuration options can also be generated by running puppet with
84
84
  '--genconfig'.
@@ -194,7 +194,7 @@ setting, so you can specify '--ssldir <directory>' as an
194
194
  argument.
195
195
 
196
196
  See the configuration file documentation at
197
- https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
197
+ https://puppet.com/docs/puppet/latest/configuration.html for the
198
198
  full list of acceptable parameters. A commented list of all
199
199
  configuration options can also be generated by running puppet cert with
200
200
  '--genconfig'.
@@ -83,7 +83,7 @@ puppet-device(8) -- #{summary}
83
83
 
84
84
  SYNOPSIS
85
85
  --------
86
- Retrieves catalogs from the Puppet master and applies them to remote devices.
86
+ Retrieves catalogs from the Puppet master and applies them to remote devices.
87
87
 
88
88
  This subcommand can be run manually; or periodically using cron,
89
89
  a scheduled task, or a similar tool.
@@ -106,9 +106,9 @@ retrieve and apply catalogs, and store reports.
106
106
 
107
107
  USAGE NOTES
108
108
  -----------
109
- Devices managed by the puppet-device subcommand on a Puppet agent are
110
- configured in device.conf, which is located at $confdir/device.conf by default,
111
- and is configurable with the $deviceconfig setting.
109
+ Devices managed by the puppet-device subcommand on a Puppet agent are
110
+ configured in device.conf, which is located at $confdir/device.conf by default,
111
+ and is configurable with the $deviceconfig setting.
112
112
 
113
113
  The device.conf file is an INI-like file, with one section per device:
114
114
 
@@ -117,20 +117,20 @@ type <TYPE>
117
117
  url <URL>
118
118
  debug
119
119
 
120
- The section name specifies the certname of the device.
120
+ The section name specifies the certname of the device.
121
121
 
122
122
  The values for the type and url properties are specific to each type of device.
123
123
 
124
124
  The optional debug property specifies transport-level debugging,
125
125
  and is limited to telnet and ssh transports.
126
126
 
127
- See https://docs.puppet.com/puppet/latest/config_file_device.html for details.
127
+ See https://puppet.com/docs/puppet/latest/config_file_device.html for details.
128
128
 
129
129
 
130
130
  OPTIONS
131
131
  -------
132
- Note that any setting that's valid in the configuration file is also a valid
133
- long argument. For example, 'server' is a valid configuration parameter, so
132
+ Note that any setting that's valid in the configuration file is also a valid
133
+ long argument. For example, 'server' is a valid configuration parameter, so
134
134
  you can specify '--server <servername>' as an argument.
135
135
 
136
136
  * --debug:
@@ -151,7 +151,7 @@ You can provide multiple lookup keys to this command, but it only returns a
151
151
  value for the first found key, omitting the rest.
152
152
 
153
153
  For more details about how Hiera works, see the Hiera documentation:
154
- https://docs.puppet.com/puppet/latest/hiera_intro.html
154
+ https://puppet.com/docs/puppet/latest/hiera_intro.html
155
155
 
156
156
  OPTIONS
157
157
  -------
@@ -65,7 +65,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
65
65
  '--setting' and '--no-setting' pairs.
66
66
 
67
67
  See the configuration file documentation at
68
- https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
68
+ https://puppet.com/docs/puppet/latest/configuration.html for the
69
69
  full list of acceptable settings. A commented list of all settings can also be
70
70
  generated by running puppet master with '--genconfig'.
71
71
 
@@ -76,7 +76,7 @@ setting, so you can specify '--ssldir <directory>' as an
76
76
  argument.
77
77
 
78
78
  See the configuration file documentation at
79
- https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
79
+ https://puppet.com/docs/puppet/latest/configuration.html for the
80
80
  full list of acceptable parameters. A commented list of all
81
81
  configuration options can also be generated by running puppet with
82
82
  '--genconfig'.
@@ -55,7 +55,7 @@ valid setting, so you can specify '--environment mytest'
55
55
  as an argument.
56
56
 
57
57
  See the configuration file documentation at
58
- https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
58
+ https://puppet.com/docs/puppet/latest/configuration.html for the
59
59
  full list of acceptable parameters. A commented list of all
60
60
  configuration options can also be generated by running puppet with
61
61
  '--genconfig'.
@@ -201,7 +201,7 @@ module Puppet
201
201
  :static_catalogs => {
202
202
  :default => true,
203
203
  :type => :boolean,
204
- :desc => "Whether to compile a [static catalog](https://docs.puppet.com/puppet/latest/static_catalogs.html#enabling-or-disabling-static-catalogs),
204
+ :desc => "Whether to compile a [static catalog](https://puppet.com/docs/puppet/latest/static_catalogs.html#enabling-or-disabling-static-catalogs),
205
205
  which occurs only on a Puppet Server master when the `code-id-command` and
206
206
  `code-content-command` settings are configured in its `puppetserver.conf` file.",
207
207
  },
@@ -352,7 +352,7 @@ module Puppet
352
352
 
353
353
  This setting must have a value set to enable **directory environments.** The
354
354
  recommended value is `$codedir/environments`. For more details, see
355
- <https://docs.puppet.com/puppet/latest/reference/environments.html>",
355
+ <https://puppet.com/docs/puppet/latest/environments_about.html>",
356
356
  :type => :path,
357
357
  },
358
358
  :always_retry_plugins => {
@@ -441,7 +441,7 @@ module Puppet
441
441
 
442
442
  * `plain` --- Returns no data, so that the main manifest controls all node configuration.
443
443
  * `exec` --- Uses an
444
- [external node classifier (ENC)](https://docs.puppet.com/puppet/latest/nodes_external.html),
444
+ [external node classifier (ENC)](https://puppet.com/docs/puppet/latest/nodes_external.html),
445
445
  configured by the `external_nodes` setting. This lets you pull a list of Puppet classes
446
446
  from any external system, using a small glue script to perform the request and format the
447
447
  result as YAML.
@@ -709,15 +709,15 @@ module Puppet
709
709
  `certname` setting as its requested Subject CN.
710
710
 
711
711
  This is the name used when managing a node's permissions in
712
- [auth.conf](https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html).
712
+ [auth.conf](https://puppet.com/docs/puppet/latest/config_file_auth.html).
713
713
  In most cases, it is also used as the node's name when matching
714
- [node definitions](https://docs.puppetlabs.com/puppet/latest/reference/lang_node_definitions.html)
714
+ [node definitions](https://puppet.com/docs/puppet/latest/lang_node_definitions.html)
715
715
  and requesting data from an ENC. (This can be changed with the `node_name_value`
716
716
  and `node_name_fact` settings, although you should only do so if you have
717
717
  a compelling reason.)
718
718
 
719
719
  A node's certname is available in Puppet manifests as `$trusted['certname']`. (See
720
- [Facts and Built-In Variables](https://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html)
720
+ [Facts and Built-In Variables](https://puppet.com/docs/puppet/latest/lang_facts_and_builtin_vars.html)
721
721
  for more details.)
722
722
 
723
723
  * For best compatibility, you should limit the value of `certname` to
@@ -752,7 +752,7 @@ change this setting; you also need to:
752
752
  * On the server: Stop Puppet Server.
753
753
  * On the CA server: Revoke and clean the server's old certificate. (`puppet cert clean <NAME>`)
754
754
  * On the server: Delete the old certificate (and any old certificate signing requests)
755
- from the [ssldir](https://docs.puppetlabs.com/puppet/latest/reference/dirs_ssldir.html).
755
+ from the [ssldir](https://puppet.com/docs/puppet/latest/dirs_ssldir.html).
756
756
  * On the server: Run `puppet agent -t --ca_server <CA HOSTNAME>` to request a new certificate
757
757
  * On the CA server: Sign the certificate request, explicitly allowing alternate names
758
758
  (`puppet cert sign --allow-dns-alt-names <NAME>`).
@@ -1084,7 +1084,7 @@ EOT
1084
1084
  the request.
1085
1085
 
1086
1086
  For info on autosign configuration files, see
1087
- [the guide to Puppet's config files](https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html).",
1087
+ [the guide to Puppet's config files](https://puppet.com/docs/puppet/latest/config_about_settings.html).",
1088
1088
  },
1089
1089
  :allow_duplicate_certs => {
1090
1090
  :default => false,
@@ -1157,7 +1157,7 @@ EOT
1157
1157
  directory environments instead. If you need to use something other than the
1158
1158
  environment's `manifests` directory as the main manifest, you can set
1159
1159
  `manifest` in environment.conf. For more info, see
1160
- <https://docs.puppet.com/puppet/latest/reference/environments.html>",
1160
+ <https://puppet.com/docs/puppet/latest/environments_about.html>",
1161
1161
  },
1162
1162
  :modulepath => {
1163
1163
  :default => "",
@@ -1171,7 +1171,7 @@ EOT
1171
1171
  directory environments instead. If you need to use something other than the
1172
1172
  default modulepath of `<ACTIVE ENVIRONMENT'S MODULES DIR>:$basemodulepath`,
1173
1173
  you can set `modulepath` in environment.conf. For more info, see
1174
- <https://docs.puppet.com/puppet/latest/reference/environments.html>",
1174
+ <https://puppet.com/docs/puppet/latest/environments_about.html>",
1175
1175
  },
1176
1176
  :config_version => {
1177
1177
  :default => "",
@@ -1183,7 +1183,7 @@ EOT
1183
1183
  Setting a global value for config_version in puppet.conf is not allowed
1184
1184
  (but it can be overridden from the commandline). Please set a
1185
1185
  per-environment value in environment.conf instead. For more info, see
1186
- <https://docs.puppet.com/puppet/latest/reference/environments.html>",
1186
+ <https://puppet.com/docs/puppet/latest/environments_about.html>",
1187
1187
  }
1188
1188
  )
1189
1189
 
@@ -1286,7 +1286,13 @@ EOT
1286
1286
  :desc => "File that provides mapping between custom SSL oids and user-friendly names"
1287
1287
  },
1288
1288
  :basemodulepath => {
1289
- :default => "$codedir/modules#{File::PATH_SEPARATOR}/opt/puppetlabs/puppet/modules",
1289
+ :default => lambda do
1290
+ if Puppet::Util::Platform.windows?
1291
+ '$codedir/modules'
1292
+ else
1293
+ '$codedir/modules:/opt/puppetlabs/puppet/modules'
1294
+ end
1295
+ end,
1290
1296
  :type => :path,
1291
1297
  :desc => "The search path for **global** modules. Should be specified as a
1292
1298
  list of directories separated by the system path separator character. (The
@@ -1295,7 +1301,7 @@ EOT
1295
1301
  These are the modules that will be used by _all_ environments. Note that
1296
1302
  the `modules` directory of the active environment will have priority over
1297
1303
  any global directories. For more info, see
1298
- <https://docs.puppet.com/puppet/latest/reference/environments.html>",
1304
+ <https://puppet.com/docs/puppet/latest/environments_about.html>",
1299
1305
  },
1300
1306
  :ssl_client_header => {
1301
1307
  :default => "HTTP_X_CLIENT_DN",
@@ -1481,7 +1487,7 @@ EOT
1481
1487
  For control over logging destinations, see the `--logdest` command line
1482
1488
  option in the manual pages for puppet master, puppet agent, and puppet
1483
1489
  apply. You can see man pages by running `puppet <SUBCOMMAND> --help`,
1484
- or read them online at https://docs.puppetlabs.com/puppet/latest/reference/man/."
1490
+ or read them online at https://puppet.com/docs/puppet/latest/man/."
1485
1491
  },
1486
1492
  :server => {
1487
1493
  :default => "puppet",
@@ -1550,7 +1556,7 @@ EOT
1550
1556
  event _would_ have been sent.
1551
1557
 
1552
1558
  **Important note:**
1553
- [The `noop` metaparameter](https://docs.puppetlabs.com/puppet/latest/reference/metaparameter.html#noop)
1559
+ [The `noop` metaparameter](https://puppet.com/docs/puppet/latest/metaparameter.html#noop)
1554
1560
  allows you to apply individual resources in noop mode, and will override
1555
1561
  the global value of the `noop` setting. This means a resource with
1556
1562
  `noop => false` _will_ be changed if necessary, even when running puppet
@@ -1893,7 +1899,7 @@ EOT
1893
1899
 
1894
1900
  Generally, an ENC script makes requests to an external data source.
1895
1901
 
1896
- For more info, see [the ENC documentation](https://docs.puppet.com/puppet/latest/nodes_external.html).",
1902
+ For more info, see [the ENC documentation](https://puppet.com/docs/puppet/latest/nodes_external.html).",
1897
1903
  }
1898
1904
  )
1899
1905