Skip to content

Commit dddbd8d

Browse files
reidmvnpwalker
authored andcommitted
(maint) Update Puppetfile versions, update style
This commit updates the Puppetfile example module versions to list the latest releases for the example modules as of 2019-07-10, and also updates several files for style. Standardizing on double-quotes in YAML due to: 1. Functional irrelevance between single vs. double quotes in our YAML 2. Prevalent use of double-quotes in Puppet documentation 3. Similar look-and-feel to other data serialization formats like JSON
1 parent 535d944 commit dddbd8d

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

Puppetfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ forge 'https://forge.puppet.com'
22

33
# Modules from the Puppet Forge
44
# Versions should be updated to be the latest at the time you start
5-
#mod 'puppetlabs/inifile', '2.2.1'
6-
#mod 'puppetlabs/stdlib', '4.25.1'
7-
#mod 'puppetlabs/concat', '4.2.1'
5+
#mod 'puppetlabs/inifile', '3.0.0'
6+
#mod 'puppetlabs/stdlib', '6.0.0'
7+
#mod 'puppetlabs/concat', '6.0.0'
88

99
# Modules from Git
1010
# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
1111
#mod 'apache',
12-
# :git => 'https://github.com/puppetlabs/puppetlabs-apache',
13-
# :commit => 'de290646f97e04b4b8e42c70f6e01e860c394ce7'
12+
# git: 'https://github.com/puppetlabs/puppetlabs-apache',
13+
# commit: '1b6f89afdde0df7f9433a163d5c4b5328eac5779'
1414

1515
#mod 'apache',
16-
# :git => 'https://github.com/puppetlabs/puppetlabs-apache',
17-
# :branch => 'docs_experiment'
16+
# git: 'https://github.com/puppetlabs/puppetlabs-apache',
17+
# branch: 'docs_experiment'

environment.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
modulepath = site-modules:modules:$basemodulepath
2-
config_version = 'scripts/config_version.sh $environmentpath $environment'
1+
modulepath = site-modules:modules:$basemodulepath
2+
config_version = 'scripts/config_version.sh $environmentpath $environment'

hiera.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ defaults:
55
datadir: "data"
66

77
hierarchy:
8-
- name: 'Yaml backend'
8+
- name: "Yaml backend"
99
data_hash: yaml_data
1010
paths:
1111
- "nodes/%{trusted.certname}.yaml"
12-
- 'common.yaml'
12+
- "common.yaml"

0 commit comments

Comments
 (0)