debsources -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ffaafe9..4746258 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -255,8 +255,6 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  debsources:
-    - sor.debian.org
   apache_ratelimited:
     - beach.debian.org
     - buxtehude.debian.org

diff --git a/hieradata/nodes/sor.debian.org.yaml b/hieradata/nodes/sor.debian.org.yaml
new file mode 100644 (file)
index 0000000..a68b8db
--- /dev/null
+++ b/hieradata/nodes/sor.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::debsources

diff --git a/modules/roles/manifests/debsources.pp b/modules/roles/manifests/debsources.pp
index 6633b51..f3af3ca 100644 (file)
--- a/modules/roles/manifests/debsources.pp
+++ b/modules/roles/manifests/debsources.pp
@@ -1,14 +1,17 @@
 class roles::debsources {
-       ssl::service { 'sources.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
-       }
+  include apache2
+  include apache2::ssl
 
-       include apache2::ssl
-       apache2::module { 'http2': }
-       package { 'libapache2-mod-wsgi': ensure => installed, }
-       apache2::site { 'sources.debian.org':
-               site => 'sources.debian.org',
-               source => 'puppet:///modules/roles/debsources/sources.debian.org.conf',
-       }
+  apache2::module { 'http2': }
+
+  package { 'libapache2-mod-wsgi': ensure => installed, }
+
+  apache2::site { 'sources.debian.org':
+    site   => 'sources.debian.org',
+    source => 'puppet:///modules/roles/debsources/sources.debian.org.conf',
+  }
+  ssl::service { 'sources.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 }

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 1f56445..765e1e0 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -224,8 +224,4 @@ class roles {
        if has_role('popcon') {
                include roles::popcon
        }
-
-       if has_role('debsources') {
-               include roles::debsources
-       }
 }