packages -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b805539..db93f44 100644 (file)
--- 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 (file)
index 0000000..d671e4a
--- /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 (file)
index 0000000..d671e4a
--- /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 0ce9337..ec3f6e1 100644 (file)
--- 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 (file)
index 0000000..26022c3
--- /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, }
+}