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

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a4f01d567..210636f14 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -35,8 +35,6 @@ staticsync::basedir: '/srv/static.debian.org'
 roles:
   bugsmx:
     - buxtehude.debian.org
-  contributors:
-    - nono.debian.org
   debtags:
     - tate.debian.org
   dns_primary:
diff --git a/hieradata/nodes/nono.debian.org.yaml b/hieradata/nodes/nono.debian.org.yaml
index 6f30e7f7a..50b093514 100644
--- a/hieradata/nodes/nono.debian.org.yaml
+++ b/hieradata/nodes/nono.debian.org.yaml
@@ -1,3 +1,4 @@
 ---
 classes:
+  - roles::contributors
   - roles::nm
diff --git a/modules/roles/manifests/contributors.pp b/modules/roles/manifests/contributors.pp
index 856b84afe..6750e059e 100644
--- a/modules/roles/manifests/contributors.pp
+++ b/modules/roles/manifests/contributors.pp
@@ -1,6 +1,7 @@
 class roles::contributors {
-	ssl::service { 'contributors.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  include apache2
+  ssl::service { 'contributors.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 }
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ca72b6b89..2e9f5691d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -119,10 +119,6 @@ class roles {
 		include roles::sso_rp
 	}
 
-	if has_role('contributors') {
-		include roles::contributors
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}