From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 29 Aug 2019 15:50:09 +0000 (+0200)
Subject: The syntax check won't let me include our site module, probably due to its name.... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e5202157f555850043693940706477210d0077b9;p=mirror%2Fdsa-puppet.git

The syntax check won't let me include our site module, probably due to its name.  Try via hiera, but merge it into base eventually
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index eb7134dff..f3391ad85 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -380,4 +380,5 @@ roles:
     - lotti.debian.org
 
 classes:
+  - site
   - base
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 5083d71ff..6c382d278 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,5 +1,4 @@
 class base {
-    include site
     include munin
     include syslog_ng
     include sudo