From 057d47bc6e9d86749adebc1f9c94a93ba7df6a1b Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 14:53:08 +0200
Subject: [PATCH] tracker -> hiera role; explicitly include apache2

---
 hieradata/common.yaml                     | 2 --
 hieradata/nodes/ticharich.debian.org.yaml | 3 +++
 modules/roles/manifests/init.pp           | 4 ----
 modules/roles/manifests/tracker.pp        | 1 +
 4 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 hieradata/nodes/ticharich.debian.org.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 0e0dd2f5a..83b5721d5 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -176,8 +176,6 @@ roles:
     - mirror-umn.debian.org
     - schmelzer.debian.org
     - smit.debian.org
-  tracker:
-    - ticharich.debian.org
   udd:
     - ullmann.debian.org
   wiki:
diff --git a/hieradata/nodes/ticharich.debian.org.yaml b/hieradata/nodes/ticharich.debian.org.yaml
new file mode 100644
index 000000000..07f12425f
--- /dev/null
+++ b/hieradata/nodes/ticharich.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::tracker
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 35c277a39..cf85807f0 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -129,10 +129,6 @@ class roles {
 		include roles::sso_rp
 	}
 
-	if has_role('tracker') {
-		include roles::tracker
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
diff --git a/modules/roles/manifests/tracker.pp b/modules/roles/manifests/tracker.pp
index ff7e8d463..930e1640d 100644
--- a/modules/roles/manifests/tracker.pp
+++ b/modules/roles/manifests/tracker.pp
@@ -1,4 +1,5 @@
 class roles::tracker {
+  include apache2
   package { 'libapache2-mod-wsgi-py3': ensure => installed, }
   apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
   ssl::service { 'tracker.debian.org':
-- 
2.20.1