set TLSA port to 0 in preparation of cert roll for buildd, contributors, ftp-master...

[mirror/dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5efac97..badf9a4 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -19,7 +19,8 @@ class roles {
        if has_role('nagiosmaster') {
        #       include nagios::server
                ssl::service { 'nagios.debian.org':
-                       notify => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
+                       tlsaport => 0,
                }
        }
 
@@ -43,14 +44,11 @@ class roles {
 
        if has_role('bugs_base') {
                ssl::service { 'bugs.debian.org':
-                       notify => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
                }
        }
        if has_role('bugs_master') {
-               ssl::service { 'bugs-master.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('ftp_master') {
@@ -60,28 +58,21 @@ class roles {
 
        if has_role('api.ftp-master') {
                ssl::service { 'api.ftp-master.debian.org':
-                       notify => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
+                       key => true,
                }
        }
 
        if has_role('manpages') {
-               ssl::service { 'manpages.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
-       # XXX: turn this into a real role
-       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+       if has_role('security_mirror') {
                include roles::security_mirror
        }
-
-       if has_role('mirror_debug') {
+       if has_role('debug_mirror') {
                include roles::debug_mirror
        }
-       if has_role('mirror_ports') {
-               include roles::ports_mirror
-       }
 
        if has_role('ftp.d.o') {
                include roles::ftp
@@ -100,10 +91,8 @@ class roles {
        }
 
        if has_role('people') {
-               ssl::service { 'people.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'people.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+               onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
        }
 
        if has_role('security_master') {
@@ -116,10 +105,7 @@ class roles {
        }
 
        if has_role('cgi.d.o') {
-               ssl::service { 'cgi.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('keyring') {
@@ -248,32 +234,19 @@ class roles {
        }
 
        if has_role('packages') {
-               ssl::service { 'packages.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('qamaster') {
-               ssl::service { 'qa.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('packagesqamaster') {
-               ssl::service { 'packages.qa.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('gobby_debian_org') {
-               ssl::service { 'gobby.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-                       tlsaport => [443, 6523],
-               }
+               ssl::service { 'gobby.debian.org': notify  => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
        }
 
        if has_role('search_backend') {
@@ -295,10 +268,7 @@ class roles {
        }
 
        if has_role('veyepar.debian.org') {
-               ssl::service { 'veyepar.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('httpredir') {
@@ -310,56 +280,37 @@ class roles {
        }
 
        if has_role('planet_search') {
-               ssl::service { 'planet-search.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('i18n.d.o') {
-               ssl::service { 'i18n.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('l10n.d.o') {
-               ssl::service { 'l10n.debian.org':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('dedup.d.n') {
-               ssl::service { 'dedup.debian.net':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'dedup.debian.net': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('pet.d.n') {
-               ssl::service { 'pet.debian.net':
-                       notify => Service['apache2'],
-                       key => true,
-               }
-               ssl::service { 'pet-devel.debian.net':
-                       notify => Service['apache2'],
-                       key => true,
-               }
+               ssl::service { 'pet.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+               ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
        }
 
        if has_role('ports-master') {
                include roles::ports-master
        }
+       if has_role('ports_mirror') {
+               include roles::ports_mirror
+       }
 
        if $::hostname in [klecker] {
-               onion::service { 'ftp.debian.org':
-                       port => 80,
-                       target_address => '130.89.148.12',
-                       target_port => 81,
-               }
+               onion::service { 'ftp.debian.org': port => 80, target_address => '130.89.148.12', target_port => 81, }
        }
-       if $::hostname in [olin] {
-               onion::balance_service { 'ftp.debian.org': }
+       if has_role('onionbalance') {
+               include onion::balance
        }
 }