From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 13:22:28 +0000 (+0200)
Subject: debtags -> hiera role; explicitly include apache2
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fd694c2d9a6835eb0b27f610bd495d200665c2f6;p=mirror%2Fdsa-puppet.git

debtags -> hiera role; explicitly include apache2
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 210636f14..93b87a733 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -35,8 +35,6 @@ staticsync::basedir: '/srv/static.debian.org'
 roles:
   bugsmx:
     - buxtehude.debian.org
-  debtags:
-    - tate.debian.org
   dns_primary:
     - denis.debian.org
   dns_geo:
diff --git a/hieradata/nodes/tate.debian.org.yaml b/hieradata/nodes/tate.debian.org.yaml
new file mode 100644
index 000000000..fc6882fd2
--- /dev/null
+++ b/hieradata/nodes/tate.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::debtags
diff --git a/modules/roles/manifests/debtags.pp b/modules/roles/manifests/debtags.pp
index 23c81f2c1..8e350c6eb 100644
--- a/modules/roles/manifests/debtags.pp
+++ b/modules/roles/manifests/debtags.pp
@@ -1,16 +1,17 @@
 class roles::debtags {
-	include apache2::ssl
+  include apache2
+  include apache2::ssl
 
-	package { 'libapache2-mod-wsgi-py3': ensure => installed, }
-	apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
+  package { 'libapache2-mod-wsgi-py3': ensure => installed, }
+  apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
 
-	ssl::service { 'debtags.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  ssl::service { 'debtags.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 
-	apache2::site { '010-debtags.debian.org':
-		site    => 'debtags.debian.org',
-		source => 'puppet:///modules/roles/debtags/debtags.debian.org',
-	}
+  apache2::site { '010-debtags.debian.org':
+    site   => 'debtags.debian.org',
+    source => 'puppet:///modules/roles/debtags/debtags.debian.org',
+  }
 }
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2e9f5691d..a10af2aea 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -185,10 +185,6 @@ class roles {
 		include roles::snapshot_shell
 	}
 
-	if has_role('debtags') {
-		include roles::debtags
-	}
-
 	if has_role('planet_master') {
 		include roles::planet_master
 	}