From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 13:26:04 +0000 (+0200)
Subject: people -> hiera role; explicitly include apache2
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6e84404e107294d258f571d6a73900d0c9eb114c;p=mirror%2Fdsa-puppet.git

people -> hiera role; explicitly include apache2
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93b87a733..916a4b365 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -75,8 +75,6 @@ roles:
     - picconi.debian.org
   packagesqamaster:
     - quantz.debian.org
-  people:
-    - paradis.debian.org
   popcon:
     - pinel.debian.org
   pubsub:
diff --git a/hieradata/nodes/paradis.debian.org.yaml b/hieradata/nodes/paradis.debian.org.yaml
new file mode 100644
index 000000000..f22e5b7a5
--- /dev/null
+++ b/hieradata/nodes/paradis.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::people
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a10af2aea..1c4dc9d53 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -62,11 +62,6 @@ class roles {
 		include roles::git_master
 	}
 
-	if has_role('people') {
-		ssl::service { 'people.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-		onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
-	}
-
 	if has_role('www_master') {
 		include roles::www_master
 	}
diff --git a/modules/roles/manifests/people.pp b/modules/roles/manifests/people.pp
new file mode 100644
index 000000000..713f1a170
--- /dev/null
+++ b/modules/roles/manifests/people.pp
@@ -0,0 +1,5 @@
+class roles::people {
+  include apache2
+  ssl::service { 'people.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+  onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
+}