From 817b44ea0391fa886bbb38b3cb032fbd74d938bb Mon Sep 17 00:00:00 2001
From: "christopher.lawrence" <chris.lawrence@puppet.com>
Date: Fri, 10 Jan 2020 10:53:14 +0000
Subject: [PATCH] fixed issues with puppet.pp code

---
 Puppetfile                                                    | 2 ++
 site-modules/profile/manifests/base/ssh.pp                    | 2 +-
 site-modules/profile/manifests/puppet/authority.pp            | 4 ++--
 .../profile/manifests/puppet/{puppet.pp => puppetserver.pp}   | 0
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename site-modules/profile/manifests/puppet/{puppet.pp => puppetserver.pp} (100%)

diff --git a/Puppetfile b/Puppetfile
index f3ea63e..34656ae 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -11,6 +11,8 @@ mod 'puppetlabs-service', '1.2.0'
 mod 'puppetlabs-ntp', '8.2.0'
 mod 'puppetlabs-apache', '5.3.0'
 mod 'ghoneycutt-ssh', '3.61.0'
+mod 'puppet-selinux', '3.1.0'
+mod 'puppetlabs-puppetserver_gem', '1.1.1'
 
 # Modules from Git
 # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
diff --git a/site-modules/profile/manifests/base/ssh.pp b/site-modules/profile/manifests/base/ssh.pp
index 9b962d7..d6520f8 100644
--- a/site-modules/profile/manifests/base/ssh.pp
+++ b/site-modules/profile/manifests/base/ssh.pp
@@ -1,4 +1,4 @@
-class profile::bootstrap::ssh (
+class profile::base::ssh (
   Hash $config_entries = {},
   String $permit_root_login = 'no',
   String $ssh_config_forward_agent = 'no',
diff --git a/site-modules/profile/manifests/puppet/authority.pp b/site-modules/profile/manifests/puppet/authority.pp
index 3e8aab1..42d3db0 100644
--- a/site-modules/profile/manifests/puppet/authority.pp
+++ b/site-modules/profile/manifests/puppet/authority.pp
@@ -2,7 +2,7 @@ class profile::puppet::authority {
 
   ini_setting { 'policy-based autosigning':
     setting => 'autosign',
-    path    => "${confdir}/puppet.conf",
+    path    => "${settings::confdir}/puppet.conf",
     section => 'master',
     value   => '/opt/puppetlabs/puppet/bin/autosign-validator',
     notify  => Service['pe-puppetserver'],
@@ -15,7 +15,7 @@ class profile::puppet::authority {
         'loglevel' => 'INFO',
       },
       'jwt_token' => {
-        'secret'   => 'puppet'
+        'secret'   => 'puppet',
         'validity' => '0',
       }
     },
diff --git a/site-modules/profile/manifests/puppet/puppet.pp b/site-modules/profile/manifests/puppet/puppetserver.pp
similarity index 100%
rename from site-modules/profile/manifests/puppet/puppet.pp
rename to site-modules/profile/manifests/puppet/puppetserver.pp