From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 30 Aug 2019 10:15:44 +0000 (+0200)
Subject: having a module named site is really annoying
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=92231a9ecd050326e3501e3c0a62b77f308025fd

having a module named site is really annoying
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b25cfd641..6c5210516 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -376,5 +376,4 @@ roles:
     - cgi-grnet-01.debian.org
 
 classes:
-  - site
   - base
diff --git a/manifests/site.pp b/manifests/site.pp
index c1cdd53db..0c178c135 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,6 +19,9 @@ Service {
 }
 
 node default {
+	# we really should rename this one
+	include site
+
 	# this is magic: it will include whatever classes says we should
 	# include, based on the value of the "classes" array
 	hiera_include('classes')