move all the unconditional includes from the top-level site.pp into a base module...

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e086c4b..eb7134d 100644 (file)
--- 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 88f565d..c1cdd53 100644 (file)
--- 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