From 467347d5b49d336f7f6898a25a2dd0737e8c5b75 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 18:08:21 +0200
Subject: [PATCH] packages -> hiera role; explicitly include apache2

---
 hieradata/common.yaml                           | 3 ---
 hieradata/nodes/picconi.debian.org.yaml         | 3 +++
 hieradata/nodes/pkgmirror-csail.debian.org.yaml | 3 +++
 modules/roles/manifests/init.pp                 | 4 ----
 modules/roles/manifests/packages.pp             | 4 ++++
 5 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 hieradata/nodes/picconi.debian.org.yaml
 create mode 100644 hieradata/nodes/pkgmirror-csail.debian.org.yaml
 create mode 100644 modules/roles/manifests/packages.pp

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b805539ac..db93f449c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -58,9 +58,6 @@ roles:
     - menotti.debian.org
   nagiosmaster:
     - tchaikovsky.debian.org
-  packages:
-    - picconi.debian.org
-    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
diff --git a/hieradata/nodes/picconi.debian.org.yaml b/hieradata/nodes/picconi.debian.org.yaml
new file mode 100644
index 000000000..d671e4a97
--- /dev/null
+++ b/hieradata/nodes/picconi.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::packages
diff --git a/hieradata/nodes/pkgmirror-csail.debian.org.yaml b/hieradata/nodes/pkgmirror-csail.debian.org.yaml
new file mode 100644
index 000000000..d671e4a97
--- /dev/null
+++ b/hieradata/nodes/pkgmirror-csail.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::packages
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 0ce9337a0..ec3f6e1c9 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -96,10 +96,6 @@ class roles {
 		include postgres::backup_server
 	}
 
-	if has_role('packages') {
-		ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
 	if has_role('historicalpackages') {
 		ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
diff --git a/modules/roles/manifests/packages.pp b/modules/roles/manifests/packages.pp
new file mode 100644
index 000000000..26022c37d
--- /dev/null
+++ b/modules/roles/manifests/packages.pp
@@ -0,0 +1,4 @@
+class roles::packages {
+  include apache2
+  ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+}
-- 
2.20.1