From bceb619f081ee2a8b508e1ed47c7506aa3ed17cf Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 15 Nov 2018 01:22:26 -0500
Subject: move a couple things into globals

instead of threading them through to everywhere individually
---
 manifests/00global.pp |  5 +++++
 manifests/partofme.pp | 16 +++-------------
 manifests/tozt.pp     | 14 ++------------
 3 files changed, 10 insertions(+), 25 deletions(-)
 create mode 100644 manifests/00global.pp

(limited to 'manifests')

diff --git a/manifests/00global.pp b/manifests/00global.pp
new file mode 100644
index 0000000..032a427
--- /dev/null
+++ b/manifests/00global.pp
@@ -0,0 +1,5 @@
+$default_user = 'doy'
+
+Package::Makepkg {
+  build_user => $default_user,
+}
diff --git a/manifests/partofme.pp b/manifests/partofme.pp
index 0450128..4dcef2b 100644
--- a/manifests/partofme.pp
+++ b/manifests/partofme.pp
@@ -1,17 +1,7 @@
 node 'partofme.localdomain' {
-  $default_user = 'doy'
+  $persistent_data = undef
 
-  Package::Makepkg {
-    build_user => $default_user,
-  }
+  include base
 
-  Base::User[$default_user] -> Package::Makepkg<| build_user == $default_user |>
-
-  class { 'base':
-    default_user => $default_user;
-  }
-
-  class { 'partofme::backups':
-    default_user => $default_user;
-  }
+  include partofme::backups
 }
diff --git a/manifests/tozt.pp b/manifests/tozt.pp
index 40d81a4..3c36818 100644
--- a/manifests/tozt.pp
+++ b/manifests/tozt.pp
@@ -1,20 +1,10 @@
 node 'tozt.localdomain' {
-  $default_user = 'doy'
   $persistent_data = '/media/persistent'
-
-  Package::Makepkg {
-    build_user => $default_user,
-  }
-
-  Base::User[$default_user] -> Package::Makepkg<| build_user == $default_user |>
-
   include tozt::persistent
-  class { 'base':
-    default_user => $default_user,
-    persistent_data => $persistent_data,
-  }
   Class['tozt::persistent'] -> Class['base']
 
+  include base
+
   include tozt::backups
   include tozt::git
   include tozt::pass
-- 
cgit v1.2.3-54-g00ecf