From a7e5f6e486aaeec4675d6cb6732a738635ed30a7 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 18:11:07 +0200
Subject: [PATCH] historicalpackages -> hiera role; explicitly include apache2

---
 hieradata/common.yaml                         | 2 --
 hieradata/nodes/hier.debian.org.yaml          | 3 +++
 modules/roles/manifests/historicalpackages.pp | 4 ++++
 modules/roles/manifests/init.pp               | 3 ---
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 hieradata/nodes/hier.debian.org.yaml
 create mode 100644 modules/roles/manifests/historicalpackages.pp

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index db93f449c..aff2fa0c1 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -47,8 +47,6 @@ roles:
     - fasolo.debian.org
   git_master:
     - adayevskaya.debian.org
-  historicalpackages:
-    - hier.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
diff --git a/hieradata/nodes/hier.debian.org.yaml b/hieradata/nodes/hier.debian.org.yaml
new file mode 100644
index 000000000..4920035ef
--- /dev/null
+++ b/hieradata/nodes/hier.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::historicalpackages
diff --git a/modules/roles/manifests/historicalpackages.pp b/modules/roles/manifests/historicalpackages.pp
new file mode 100644
index 000000000..d3537bd12
--- /dev/null
+++ b/modules/roles/manifests/historicalpackages.pp
@@ -0,0 +1,4 @@
+class roles::historicalpackages {
+  include apache2
+  ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+}
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ec3f6e1c9..d77859e23 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -96,9 +96,6 @@ class roles {
 		include postgres::backup_server
 	}
 
-	if has_role('historicalpackages') {
-		ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
 
 	if has_role('qamaster') {
 		ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-- 
2.20.1