From dddbd8d15c0f8432c8dbb512c74c45eae312fc32 Mon Sep 17 00:00:00 2001
From: Reid Vandewiele <reid@puppetlabs.com>
Date: Wed, 10 Jul 2019 11:22:04 -0700
Subject: [PATCH] (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
---
 Puppetfile       | 14 +++++++-------
 environment.conf |  4 ++--
 hiera.yaml       |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index a771dd2..cb744bb 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -2,16 +2,16 @@ forge 'https://forge.puppet.com'
 
 # Modules from the Puppet Forge
 # Versions should be updated to be the latest at the time you start
-#mod 'puppetlabs/inifile',     '2.2.1'
-#mod 'puppetlabs/stdlib',      '4.25.1'
-#mod 'puppetlabs/concat',      '4.2.1'
+#mod 'puppetlabs/inifile', '3.0.0'
+#mod 'puppetlabs/stdlib',  '6.0.0'
+#mod 'puppetlabs/concat',  '6.0.0'
 
 # Modules from Git
 # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
 #mod 'apache',
-#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
-#  :commit => 'de290646f97e04b4b8e42c70f6e01e860c394ce7'
+#  git:    'https://github.com/puppetlabs/puppetlabs-apache',
+#  commit: '1b6f89afdde0df7f9433a163d5c4b5328eac5779'
 
 #mod 'apache',
-#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
-#  :branch => 'docs_experiment'
+#  git:    'https://github.com/puppetlabs/puppetlabs-apache',
+#  branch: 'docs_experiment'
diff --git a/environment.conf b/environment.conf
index 11e1003..4944466 100644
--- a/environment.conf
+++ b/environment.conf
@@ -1,2 +1,2 @@
-modulepath          = site-modules:modules:$basemodulepath
-config_version      = 'scripts/config_version.sh $environmentpath $environment'
+modulepath     = site-modules:modules:$basemodulepath
+config_version = 'scripts/config_version.sh $environmentpath $environment'
diff --git a/hiera.yaml b/hiera.yaml
index 912ba45..0f5c657 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -5,8 +5,8 @@ defaults:
   datadir: "data"
 
 hierarchy:
-  - name: 'Yaml backend'
+  - name: "Yaml backend"
     data_hash: yaml_data
     paths:
       - "nodes/%{trusted.certname}.yaml"
-      - 'common.yaml'
+      - "common.yaml"