dgit_{browse,git} -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index c811609..ffaafe9 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -48,10 +48,6 @@ roles:
   ftp.upload.d.o:
     - coccia.debian.org
     - usper.debian.org
-  dgit_browse:
-    - cgi-grnet-01.debian.org
-  dgit_git:
-    - cgi-grnet-01.debian.org
   git_master:
     - adayevskaya.debian.org
   historicalpackages:

diff --git a/hieradata/nodes/cgi-grnet-01.debian.org.yaml b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
index 7cd1ffc..4fb099d 100644 (file)
--- a/hieradata/nodes/cgi-grnet-01.debian.org.yaml
+++ b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
@@ -1,4 +1,6 @@
 ---
 classes:
   - roles::anonscm
+  - roles::dgit_browse
+  - roles::dgit_git
   - roles::search_frontend

diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp
index 72ceebd..2db86c8 100644 (file)
--- a/modules/roles/manifests/dgit_browse.pp
+++ b/modules/roles/manifests/dgit_browse.pp
@@ -1,24 +1,25 @@
 class roles::dgit_browse {
-       ssl::service { 'browse.dgit.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
-       }
+  include apache2
 
-       package { 'cgit': ensure => installed, }
-       package { 'python-pygments': ensure => installed, }
-       package { 'python-chardet': ensure => installed, }
+  ssl::service { 'browse.dgit.debian.org':
+    notify  => Exec['service apache2 reload'],
+    key => true,
+  }
 
-       file { '/etc/cgitrc':
-               source => 'puppet:///modules/roles/dgit/cgitrc',
-       }
-       file { '/etc/apache2/conf-enabled/cgit.conf':
-               ensure => absent,
-               notify  => Exec['service apache2 reload'],
-       }
+  package { 'cgit': ensure => installed, }
+  package { 'python-pygments': ensure => installed, }
+  package { 'python-chardet': ensure => installed, }
 
-       apache2::site { '010-browse.dgit.debian.org':
-               site    => 'browse.dgit.debian.org',
-               source => 'puppet:///modules/roles/dgit/browse.dgit.debian.org',
-       }
+  file { '/etc/cgitrc':
+    source => 'puppet:///modules/roles/dgit/cgitrc',
+  }
+  file { '/etc/apache2/conf-enabled/cgit.conf':
+    ensure => absent,
+    notify  => Exec['service apache2 reload'],
+  }
 
+  apache2::site { '010-browse.dgit.debian.org':
+    site    => 'browse.dgit.debian.org',
+    source => 'puppet:///modules/roles/dgit/browse.dgit.debian.org',
+  }
 }

diff --git a/modules/roles/manifests/dgit_git.pp b/modules/roles/manifests/dgit_git.pp
index 866d8cb..ba71748 100644 (file)
--- a/modules/roles/manifests/dgit_git.pp
+++ b/modules/roles/manifests/dgit_git.pp
@@ -1,12 +1,13 @@
 class roles::dgit_git {
-       ssl::service { 'git.dgit.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
-       }
+  include apache2
 
-       apache2::site { '010-git.dgit.debian.org':
-               site    => 'git.dgit.debian.org',
-               source => 'puppet:///modules/roles/dgit/git.dgit.debian.org',
-       }
+  ssl::service { 'git.dgit.debian.org':
+    notify  => Exec['service apache2 reload'],
+    key => true,
+  }
 
+  apache2::site { '010-git.dgit.debian.org':
+    site    => 'git.dgit.debian.org',
+    source => 'puppet:///modules/roles/dgit/git.dgit.debian.org',
+  }
 }

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ae90e56..1f56445 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -154,13 +154,6 @@ class roles {
                }
        }
 
-       if has_role('dgit_browse') {
-               include roles::dgit_browse
-       }
-       if has_role('dgit_git') {
-               include roles::dgit_git
-       }
-
        if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
                include roles::snapshot
        }