Merge branch 'develop' into feature/default_environment

site/profiles/manifests/puppet/puppetmaster.pp

@@ -34,7 +34,15 @@ class profiles::puppet::puppetmaster {
     rundir              => '/var/run/puppetlabs/puppetserver',
     pidfile             => '/var/run/puppetlabs/puppetserver/puppetserver.pid',
     codedir             => '/etc/puppetlabs/code',
-    dns_alt_names       => ['prodinf01n01.main.unkin.net'],
+    dns_alt_names       => [
+      'prodinf01n01.main.unkin.net',
+      'puppet.main.unkin.net',
+      'puppetca.main.unkin.net',
+      'puppetmaster.main.unkin.net',
+      'puppet',
+      'puppetca',
+      'puppetmaster',
+    ],
     server              => 'prodinf01n01.main.unkin.net',
     node_terminus       => 'exec',
     external_nodes      => '/opt/puppetlabs/bin/enc',

site/roles/manifests/base.pp

@@ -1,6 +1,6 @@
 # a role to deploy the base system
 # work in progress
 class roles::base {
-    include profiles::defaults
-    include profiles::base
-  }
+  include profiles::defaults
+  include profiles::base
+}