From 75dae331d9162c52bd10b706476f86e1e4d3c017 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 15:40:02 +0200
Subject: [PATCH] debsources -> hiera role; explicitly include apache2

---
 hieradata/common.yaml                 |  2 --
 hieradata/nodes/sor.debian.org.yaml   |  3 +++
 modules/roles/manifests/debsources.pp | 25 ++++++++++++++-----------
 modules/roles/manifests/init.pp       |  4 ----
 4 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 hieradata/nodes/sor.debian.org.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ffaafe9b7..4746258f1 100644
--- 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
index 000000000..a68b8dbc4
--- /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 6633b5186..f3af3cadc 100644
--- 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 1f5644574..765e1e0f3 100644
--- 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
-	}
 }
-- 
2.20.1