X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=b17314fa12850c8468b43d3eb9cd3103ce8743ce;hb=215eb0d5ea9554968240656b34135008f83a185b;hp=67456f83aeccb9db50faca1e8c31a04eb38b67a3;hpb=f4787cc4e7d41c84896c50ff1f26f1767a7acb4e;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 67456f83a..b17314fa1 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -45,6 +45,7 @@ class roles { } } if has_role('bugs_master') { + ssl::service { 'bugs-devel.debian.org': notify => Exec['service apache2 reload'], key => true, } ssl::service { 'bugs-master.debian.org': notify => Exec['service apache2 reload'], key => true, } } @@ -57,9 +58,6 @@ class roles { } # archive.debian.org - if has_role('historical_master') { - include historical_master - } if has_role('historical_mirror') { include roles::historical_mirror } @@ -73,12 +71,10 @@ class roles { if has_role('debian_mirror') { include roles::debian_mirror } - if has_role('ftp.d.o') { - include roles::ftp - } if has_role('ftp_master') { include roles::ftp_master include roles::dakmaster + include roles::signing } if has_role('ftp.upload.d.o') { include roles::ftp_upload @@ -86,6 +82,9 @@ class roles { if has_role('ssh.upload.d.o') { include roles::ssh_upload } + if has_role('security_upload') { + include roles::security_upload + } if has_role('api.ftp-master') { ssl::service { 'api.ftp-master.debian.org': notify => Exec['service apache2 reload'], @@ -98,6 +97,7 @@ class roles { include roles::security_master include roles::dakmaster } + if has_role('security_mirror') { include roles::security_mirror } @@ -177,10 +177,6 @@ class roles { include roles::lists } - if has_role('list_search') { - include roles::listsearch - } - if has_role('rtmaster') { include roles::rtmaster } @@ -208,6 +204,9 @@ class roles { if has_role('piuparts') { include roles::piuparts } + if has_role('piuparts_slave') { + include roles::piuparts_slave + } if has_role('contributors') { include roles::contributors @@ -225,17 +224,6 @@ class roles { include roles::jenkins } - if has_role('keystone') { - include roles::keystone - } - if has_role('keystone_rabbitmq') { - include roles::keystone::rabbitmq - } - - if has_role('memcached') { - include roles::memcached - } - if has_role('postgres_backup_server') { include postgres::backup_server } @@ -244,6 +232,10 @@ class roles { ssl::service { 'packages.debian.org': notify => Exec['service apache2 reload'], key => true, } } + if has_role('historicalpackages') { + ssl::service { 'historical.packages.debian.org': notify => Exec['service apache2 reload'], key => true, } + } + if has_role('qamaster') { ssl::service { 'qa.debian.org': notify => Exec['service apache2 reload'], key => true, } } @@ -253,25 +245,45 @@ class roles { } if has_role('gobby_debian_org') { - ssl::service { 'gobby.debian.org': notify => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], } + ssl::service { 'gobby.debian.org': + notify => [ Exec['service apache2 reload'], Exec['reload gobby'] ], + key => true, + tlsaport => [443, 6523], + } + file { '/etc/ssl/debian-local/other-keys/gobby.debian.org.key': + ensure => present, + mode => '0440', + group => 'gobby', + content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.letsencrypt_dir"]) + "/gobby.debian.org.key") %>'), + links => follow, + notify => Exec['reload gobby'], + } + exec { 'reload gobby': + command => 'pkill -u gobby -HUP -x infinoted', + refreshonly => true, + } } if has_role('search_backend') { - include search_backend + include roles::search_backend } if has_role('search_frontend') { - include search_frontend + include roles::search_frontend } if has_role('dgit_browse') { - include dgit_browse + include roles::dgit_browse } if has_role('dgit_git') { - include dgit_git + include roles::dgit_git } - if $::hostname in [lw01, lw02, lw03, lw04] { - include snapshot + if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] { + include roles::snapshot + } + + if has_role('snapshot_web') { + include roles::snapshot_web } if has_role('veyepar.debian.org') { @@ -281,14 +293,13 @@ class roles { ssl::service { 'sreview.debian.net': notify => Exec['service apache2 reload'], key => true, } } - if has_role('httpredir') { - include roles::httpredir - } - if has_role('debtags') { include roles::debtags } + if has_role('planet_master') { + include roles::planet_master + } if has_role('planet_search') { ssl::service { 'planet-search.debian.org': notify => Exec['service apache2 reload'], key => true, } } @@ -317,9 +328,6 @@ class roles { include roles::ports_mirror } - if $::hostname in [klecker] { - onion::service { 'ftp.debian.org': port => 80, target_address => '130.89.148.12', target_port => 81, } - } if has_role('onionbalance') { include onion::balance } @@ -329,4 +337,57 @@ class roles { if has_role('cdimage-search') { include roles::cdimage_search } + + if has_role('postgresql_server') { + include postgres::backup_source + } + + if has_role('bacula_director') { + include bacula::director + } else { + package { 'bacula-console': ensure => purged; } + file { '/etc/bacula/bconsole.conf': ensure => absent; } + } + if has_role('bacula_storage') { + include bacula::storage + } + + if has_role('salsa.debian.org') { + include salsa + } + + if $::keyring_debian_org_mirror { + include roles::keyring_debian_org_mirror + } + + if has_role('popcon') { + include roles::popcon + } + + if has_role('debsources') { + include roles::debsources + } + + if has_role('ipsec') { + include ipsec + } + + if has_role('debconf_wafer') { + include roles::debconf_wafer + } + + if has_role('cdbuilder_local_mirror') { + include roles::cdbuilder_local_mirror + } + + if has_role('alioth_archive') { + include roles::alioth_archive + } + + if has_role('kanboard') { + include apache2 + package {'php-gd': ensure => installed } + package {'php-pgsql': ensure => installed } + package {'libapache2-mod-php': ensure => installed } + } }