Merge pull request #980 from puppetlabs/maint_fix_jekyll_version

rooneyshuman · web-flow · commit 728c71678341 · 2020-05-29T18:28:08.000-07:00
(maint) Bump Jekyll version to resolve security alert
diff --git a/Gemfile b/Gemfile
@@ -8,8 +8,8 @@ gem 'git'
 gem 'json'
 
 group(:build_site) do
-  gem 'jekyll', '3.0.1'
-  gem 'kramdown', '1.12.0'
+  gem 'jekyll', '>= 3.6.3'
+  gem 'kramdown', '~> 1.14'
   gem 'vlad'
   gem 'vlad-git'
   gem 'listen', '~> 3.0.0' # Preserve ability to run on Ruby 2.0, since listen 3.1 requires Ruby ~> 2.2.
diff --git a/source/_plugins/sitemap_generator.rb b/source/_plugins/sitemap_generator.rb
@@ -187,6 +187,7 @@ def fill_url(site, page_or_post)
     # Returns the location of the page or post
     def fill_location(site, page_or_post)
       loc = REXML::Element.new "loc"
+      site.config['baseurl'] = ""
       url = site.config['url'] + site.config['baseurl']
       loc.text = page_or_post.location_on_server(url)
 
diff --git a/source/puppet/5.3/hiera_config_yaml_5.md b/source/puppet/5.3/hiera_config_yaml_5.md
@@ -27,11 +27,11 @@ There are several hiera.yaml files in a typical deployment. Hiera uses three lay
 
 The configuration file locations for each layer:
 
-Layer       | Location                                        | Example
-------------|-------------------------------------------------|--------
-Global      | [`$confdir`][confdir]`/hiera.yaml`              | `/etc/puppetlabs/puppet/hiera.yaml` `C:\ProgramData\PuppetLabs\puppet\etc\hiera.yaml`
+Layer       | Location                                                                                       | Example
+------------|------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------
+Global      | [`$confdir`][confdir]`/hiera.yaml`                                                             | `/etc/puppetlabs/puppet/hiera.yaml` `C:\ProgramData\PuppetLabs\puppet\etc\hiera.yaml`
 Environment | [`<ENVIRONMENT>`](https://puppet.com/docs/puppet/latest/environments_about.html) `/hiera.yaml` | `/etc/puppetlabs/code/environments/production/hiera.yaml` `C:\ProgramData\PuppetLabs\code\environments\production\hiera.yaml`
-Module      | [`<MODULE>`][module]`/hiera.yaml`                           | `/etc/puppetlabs/code/environments/production/modules/ntp/hiera.yaml` `C:\ProgramData\PuppetLabs\code\environments\production\modules\ntp\hiera.yaml`
+Module      | [`<MODULE>`][module]`/hiera.yaml`                                                              | `/etc/puppetlabs/code/environments/production/modules/ntp/hiera.yaml` `C:\ProgramData\PuppetLabs\code\environments\production\modules\ntp\hiera.yaml`
 
 > Note: You can change the location for the global layer's hiera.yaml with Puppet's `hiera_config` setting.
 
@@ -191,13 +191,13 @@ Related topics: [variable interpolation][variables], [YAML][yaml_data], [JSON][j
 
 Options for specifying a file path:
 
-Key     | Data type | Expected value
---------|-----------|---------------
-`path`  | String    | One file path.
-`paths` | Array     | Any number of file paths. This acts like a sub-hierarchy: if multiple files exist, Hiera searches all of them, in the order in which they're written.
-`glob`  | String    | One shell-like glob pattern, which might match any number of files. If multiple files are found, Hiera searches all of them in alphanumerical order.
-`globs` | Array     | Any number of shell-like glob patterns. If multiple files are found, Hiera searches all of them in alphanumerical order (ignoring the order of the globs).
-`mapped_paths` | Array or Hash     | A fact that is a collection (array or hash) of values. Hiera expands these values to produce an array of paths.
+Key            | Data type     | Expected value
+---------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------
+`path`         | String        | One file path.
+`paths`        | Array         | Any number of file paths. This acts like a sub-hierarchy: if multiple files exist, Hiera searches all of them, in the order in which they're written.
+`glob`         | String        | One shell-like glob pattern, which might match any number of files. If multiple files are found, Hiera searches all of them in alphanumerical order.
+`globs`        | Array         | Any number of shell-like glob patterns. If multiple files are found, Hiera searches all of them in alphanumerical order (ignoring the order of the globs).
+`mapped_paths` | Array or Hash | A fact that is a collection (array or hash) of values. Hiera expands these values to produce an array of paths.
 
 > Note: You can only use one of these keys in a given hierarchy level.
 
@@ -209,21 +209,21 @@ File paths are relative to the `datadir`: if the full datadir is `/etc/puppetlab
 
 Globs are implemented with Ruby's `Dir.glob` method:
 
--   One asterisk (`*`) matches a run of characters.
--   Two asterisks (`**`) matches any depth of nested directories.
--   A question mark (`?`) matches one character.
--   Comma-separated lists in curly braces (`{one,two}`) match any option in the list.
--   Sets of characters in square brackets (`[abcd]`) match any character in the set.
--   A backslash (`\`) escapes special characters.
+* One asterisk (`*`) matches a run of characters.
+* Two asterisks (`**`) matches any depth of nested directories.
+* A question mark (`?`) matches one character.
+* Comma-separated lists in curly braces (`{one,two}`) match any option in the list.
+* Sets of characters in square brackets (`[abcd]`) match any character in the set.
+* A backslash (`\`) escapes special characters.
 
 Example:
 
-``` yaml
 {% raw %}
-- name: "Domain or network segment"
+``` yaml
+  - name: "Domain or network segment"
     glob: "network/**/{%{facts.networking.domain},%{facts.networking.interfaces.en0.bindings.0.network}}.yaml"
-{% endraw %]
 ```
+{% endraw %}
 
 The `mapped_paths` key must contain three string elements, in the following order:
 
diff --git a/source/puppet/5.4/hiera_config_yaml_5.md b/source/puppet/5.4/hiera_config_yaml_5.md
@@ -27,11 +27,11 @@ There are several hiera.yaml files in a typical deployment. Hiera uses three lay
 
 The configuration file locations for each layer:
 
-Layer       | Location                                        | Example
-------------|-------------------------------------------------|--------
-Global      | [`$confdir`][confdir]`/hiera.yaml`              | `/etc/puppetlabs/puppet/hiera.yaml` `C:\ProgramData\PuppetLabs\puppet\etc\hiera.yaml`
+Layer       | Location                                                                                       | Example
+------------|------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------
+Global      | [`$confdir`][confdir]`/hiera.yaml`                                                             | `/etc/puppetlabs/puppet/hiera.yaml` `C:\ProgramData\PuppetLabs\puppet\etc\hiera.yaml`
 Environment | [`<ENVIRONMENT>`](https://puppet.com/docs/puppet/latest/environments_about.html) `/hiera.yaml` | `/etc/puppetlabs/code/environments/production/hiera.yaml` `C:\ProgramData\PuppetLabs\code\environments\production\hiera.yaml`
-Module      | [`<MODULE>`][module]`/hiera.yaml`                           | `/etc/puppetlabs/code/environments/production/modules/ntp/hiera.yaml` `C:\ProgramData\PuppetLabs\code\environments\production\modules\ntp\hiera.yaml`
+Module      | [`<MODULE>`][module]`/hiera.yaml`                                                              | `/etc/puppetlabs/code/environments/production/modules/ntp/hiera.yaml` `C:\ProgramData\PuppetLabs\code\environments\production\modules\ntp\hiera.yaml`
 
 > Note: You can change the location for the global layer's hiera.yaml with Puppet's `hiera_config` setting.
 
@@ -191,13 +191,13 @@ Related topics: [variable interpolation][variables], [YAML][yaml_data], [JSON][j
 
 Options for specifying a file path:
 
-Key     | Data type | Expected value
---------|-----------|---------------
-`path`  | String    | One file path.
-`paths` | Array     | Any number of file paths. This acts like a sub-hierarchy: if multiple files exist, Hiera searches all of them, in the order in which they're written.
-`glob`  | String    | One shell-like glob pattern, which might match any number of files. If multiple files are found, Hiera searches all of them in alphanumerical order.
-`globs` | Array     | Any number of shell-like glob patterns. If multiple files are found, Hiera searches all of them in alphanumerical order (ignoring the order of the globs).
-`mapped_paths` | Array or Hash     | A fact that is a collection (array or hash) of values. Hiera expands these values to produce an array of paths.
+Key            | Data type     | Expected value
+---------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------
+`path`         | String        | One file path.
+`paths`        | Array         | Any number of file paths. This acts like a sub-hierarchy: if multiple files exist, Hiera searches all of them, in the order in which they're written.
+`glob`         | String        | One shell-like glob pattern, which might match any number of files. If multiple files are found, Hiera searches all of them in alphanumerical order.
+`globs`        | Array         | Any number of shell-like glob patterns. If multiple files are found, Hiera searches all of them in alphanumerical order (ignoring the order of the globs).
+`mapped_paths` | Array or Hash | A fact that is a collection (array or hash) of values. Hiera expands these values to produce an array of paths.
 
 > Note: You can only use one of these keys in a given hierarchy level.
 
@@ -209,21 +209,21 @@ File paths are relative to the `datadir`: if the full datadir is `/etc/puppetlab
 
 Globs are implemented with Ruby's `Dir.glob` method:
 
--   One asterisk (`*`) matches a run of characters.
--   Two asterisks (`**`) matches any depth of nested directories.
--   A question mark (`?`) matches one character.
--   Comma-separated lists in curly braces (`{one,two}`) match any option in the list.
--   Sets of characters in square brackets (`[abcd]`) match any character in the set.
--   A backslash (`\`) escapes special characters.
+* One asterisk (`*`) matches a run of characters.
+* Two asterisks (`**`) matches any depth of nested directories.
+* A question mark (`?`) matches one character.
+* Comma-separated lists in curly braces (`{one,two}`) match any option in the list.
+* Sets of characters in square brackets (`[abcd]`) match any character in the set.
+* A backslash (`\`) escapes special characters.
 
 Example:
 
-``` yaml
 {% raw %}
-- name: "Domain or network segment"
+``` yaml
+  - name: "Domain or network segment"
     glob: "network/**/{%{facts.networking.domain},%{facts.networking.interfaces.en0.bindings.0.network}}.yaml"
-{% endraw %]
 ```
+{% endraw %}
 
 The `mapped_paths` key must contain three string elements, in the following order:
 
