i18n, l10n -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 2b06049..4c39fc1 100644 (file)
--- 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 (file)
index 0000000..b8e7d38
--- /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 (file)
index 0000000..73c6db8
--- /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 450e7f6..bc752fb 100644 (file)
--- 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 (file)
index 0000000..d149c05
--- /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, }
+}