From c2097f5dd0a8519b555322ba5a8983798115a037 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 18:21:34 +0200
Subject: [PATCH] i18n, l10n -> hiera role; explicitly include apache2

---
 hieradata/common.yaml               | 4 ----
 hieradata/nodes/tye.debian.org.yaml | 4 ++++
 modules/roles/manifests/i18n.pp     | 4 ++++
 modules/roles/manifests/init.pp     | 8 --------
 modules/roles/manifests/l10n.pp     | 4 ++++
 5 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 hieradata/nodes/tye.debian.org.yaml
 create mode 100644 modules/roles/manifests/i18n.pp
 create mode 100644 modules/roles/manifests/l10n.pp

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 2b06049a6..4c39fc1a7 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -185,10 +185,6 @@ roles:
   debug_mirror_onion:
     - mirror-accumu.debian.org
     - schmelzer.debian.org
-  i18n.d.o:
-    - tye.debian.org
-  l10n.d.o:
-    - tye.debian.org
   ports_master:
     - porta.debian.org
   onionbalance:
diff --git a/hieradata/nodes/tye.debian.org.yaml b/hieradata/nodes/tye.debian.org.yaml
new file mode 100644
index 000000000..b8e7d383b
--- /dev/null
+++ b/hieradata/nodes/tye.debian.org.yaml
@@ -0,0 +1,4 @@
+---
+classes:
+  - roles::i18n
+  - roles::l10n
diff --git a/modules/roles/manifests/i18n.pp b/modules/roles/manifests/i18n.pp
new file mode 100644
index 000000000..73c6db8d6
--- /dev/null
+++ b/modules/roles/manifests/i18n.pp
@@ -0,0 +1,4 @@
+class roles::i18n {
+  include apache2
+  ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+}
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 450e7f604..bc752fb87 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -117,14 +117,6 @@ class roles {
 		include roles::snapshot_shell
 	}
 
-	if has_role('i18n.d.o') {
-		ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
-	if has_role('l10n.d.o') {
-		ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
 	if has_role('ports_master') {
 		include roles::ports_master
 	}
diff --git a/modules/roles/manifests/l10n.pp b/modules/roles/manifests/l10n.pp
new file mode 100644
index 000000000..d149c05f4
--- /dev/null
+++ b/modules/roles/manifests/l10n.pp
@@ -0,0 +1,4 @@
+class roles::l10n {
+  include apache2
+  ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+}
-- 
2.20.1