historicalpackages -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index db93f44..aff2fa0 100644 (file)
--- 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 (file)
index 0000000..4920035
--- /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 (file)
index 0000000..d3537bd
--- /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 ec3f6e1..d77859e 100644 (file)
--- 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, }