From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 29 Aug 2019 15:39:34 +0000 (+0200)
Subject: move all the unconditional includes from the top-level site.pp into a base module... 
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=6ecc5aff091790a2d65d2f911215032d76e3a43d

move all the unconditional includes from the top-level site.pp into a base module which gets included by the default hiera entry
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e086c4b10..eb7134dff 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -380,4 +380,4 @@ roles:
     - lotti.debian.org
 
 classes:
-  - site
+  - base
diff --git a/manifests/site.pp b/manifests/site.pp
index 88f565d95..c1cdd53db 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -23,33 +23,6 @@ node default {
 	# include, based on the value of the "classes" array
 	hiera_include('classes')
 
-	include munin
-	include syslog_ng
-	include sudo
-	include ssh
-	include debian_org
-	include monit
-	include time
-	include ssl
-	include hardware
-	include nagios::client
-	include resolv
-	include roles
-	include motd
-	include unbound
-	include bacula::client
-	include autofs
-	include dsa_lvm
-	include grub
-	include multipath
-	include popcon
-	include portforwarder
-	include postgres
-	include haveged
-	include huge_mem
-	include tcp_bbr
-	include certregen::client
-
 	include roles::pubsub::client
 	class { 'roles::udldap::client':
 		ensure => absent