debtags -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 210636f..93b87a7 100644 (file)
--- 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 (file)
index 0000000..fc6882f
--- /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 23c81f2..8e350c6 100644 (file)
--- 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 2e9f569..a10af2a 100644 (file)
--- 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
        }