From d7a7198497cfc302141a80f52d27da8377a1aabe Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 2 Jul 2023 13:59:07 +1000
Subject: [PATCH] Added default resource settings

  * added profiles::default class in defaults.pp file
  * imported into all roles
  * cleaned up some duplicated code
---
 manifests/site.pp                           |  2 +-
 site/profiles/manifests/defaults.pp         | 30 +++++++++++++++++++++
 site/profiles/manifests/yum/global.pp       |  1 -
 site/roles/manifests/base.pp                |  1 +
 site/roles/manifests/puppet/puppetmaster.pp |  1 +
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 site/profiles/manifests/defaults.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index f2695d5..8b13789 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1 +1 @@
-#hiera_include('classes')
+
diff --git a/site/profiles/manifests/defaults.pp b/site/profiles/manifests/defaults.pp
new file mode 100644
index 0000000..5c72fb6
--- /dev/null
+++ b/site/profiles/manifests/defaults.pp
@@ -0,0 +1,30 @@
+# settings that apply to all nodes
+# use this as a place to set resource defaults
+class profiles::defaults {
+
+  # set the global exec path
+  Exec {
+    path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/'],
+  }
+
+  Package {
+    ensure => present,
+  }
+
+  File {
+    ensure => present,
+    owner => 'root',
+    group => 'root',
+    mode => '0644',
+  }
+
+  Service {
+    ensure => running,
+    enable => true,
+  }
+
+  User {
+    ensure => present,
+    shell => '/bin/bash',
+  }
+}
diff --git a/site/profiles/manifests/yum/global.pp b/site/profiles/manifests/yum/global.pp
index bbeb2dd..70481c7 100644
--- a/site/profiles/manifests/yum/global.pp
+++ b/site/profiles/manifests/yum/global.pp
@@ -81,7 +81,6 @@ class profiles::yum::global (
     command => '/bin/bash -c "comm -23 <(ls /etc/yum.repos.d | sort)
                 <(sort /etc/yum.repos.d/.managed) | 
                 xargs -n1 rm -f /etc/yum.repos.d/{}"',
-    path    => ['/bin', '/usr/bin'],
     onlyif  => '/bin/bash -c "comm -23 <(ls /etc/yum.repos.d | sort)
                 <(sort /etc/yum.repos.d/.managed) | grep .repo"',
   }
diff --git a/site/roles/manifests/base.pp b/site/roles/manifests/base.pp
index b65b67b..86164e4 100644
--- a/site/roles/manifests/base.pp
+++ b/site/roles/manifests/base.pp
@@ -1,5 +1,6 @@
 # a role to deploy the base system
 # work in progress
 class roles::base {
+    include profiles::defaults
     include profiles::base
   }
diff --git a/site/roles/manifests/puppet/puppetmaster.pp b/site/roles/manifests/puppet/puppetmaster.pp
index 9536470..b87f183 100644
--- a/site/roles/manifests/puppet/puppetmaster.pp
+++ b/site/roles/manifests/puppet/puppetmaster.pp
@@ -1,6 +1,7 @@
 # a role to deploy the puppetmaster
 # work in progress
 class roles::puppet::puppetmaster {
+    include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetmaster
   }