Try to get ipsec between storace and fasolo

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index dec4470..101058d 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,7 +71,10 @@ class roles {
                include roles::debian_mirror
        }
        if has_role('ftp.d.o') {
-               include roles::ftp
+               vsftpd::site { 'ftp':
+                       ensure  => absent,
+                       root    => '/nonexistent',
+               }
        }
        if has_role('ftp_master') {
                include roles::ftp_master
@@ -84,6 +87,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'],
@@ -243,7 +249,23 @@ 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') {
@@ -275,6 +297,9 @@ class roles {
                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, }
        }
@@ -314,7 +339,7 @@ class roles {
        }
 
        if has_role('postgresql_server') {
-               include roles::postgresql_server
+               include postgres::backup_source
        }
 
        if has_role('bacula_director') {
@@ -326,4 +351,24 @@ class roles {
        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
+       }
 }