Switch appstream, qa, *.dgit to letsencrypt

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

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index da7b5a5..ced948f 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -33,13 +33,13 @@ class roles::static_mirror {
 
        $vhost_listen = $::hostname ? {
                klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
-               mirror-isc => '149.20.20.20:80 [2001:4f8:8:36::1deb:20]:80',
+               mirror-isc => '149.20.20.22:80 [2001:4f8:8:36::1deb:22]:80',
                mirror-anu => '150.203.164.62:80 [2001:388:1034:2900::3e]:80',
                default    => '*:80',
        }
        $vhost_listen_443 = $::hostname ? {
                klecker    => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
-               mirror-isc => '149.20.20.20:443 [2001:4f8:8:36::1deb:20]:443',
+               mirror-isc => '149.20.20.22:443 [2001:4f8:8:36::1deb:22]:443',
                mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443',
                default    => '*:443',
        }
@@ -50,11 +50,13 @@ class roles::static_mirror {
 
        apache2::site { '010-planet.debian.org':
                site    => 'planet.debian.org',
+               ensure  => has_static_component('planet.debian.org') ? { true => "present", false => "absent" },
                content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
        }
 
        apache2::site { '010-lintian.debian.org':
                site    => 'lintian.debian.org',
+               ensure  => has_static_component('lintian.debian.org') ? { true => "present", false => "absent" },
                content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'),
        }
 
@@ -66,40 +68,40 @@ class roles::static_mirror {
        $wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
        apache2::site { '005-www.debian.org':
                site   => 'www.debian.org',
+               ensure  => has_static_component('www.debian.org') ? { true => "present", false => "absent" },
                content => template('roles/apache-www.debian.org.erb'),
        }
 
-       ssl::service { 'dsa.debian.org':
-               notify => Service['apache2'],
-       }
-       ssl::service { 'www.debian.org':
-               notify => Service['apache2'],
-       }
-       ssl::service { 'bits.debian.org':
-               notify => Service['apache2'],
-       }
-       ssl::service { 'lintian.debian.org':
-               notify => Service['apache2'],
-       }
-       ssl::service { 'rtc.debian.org':
-               notify => Service['apache2'],
-       }
-       ssl::service { 'appstream.debian.org':
-               notify => Service['apache2'],
-       }
-       ssl::service { 'd-i.debian.org':
-               notify => Service['apache2'],
-       }
+       ssl::service { 'dsa.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
+       ssl::service { 'www.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
+       ssl::service { 'bits.debian.org'     : ensure => "ifstatic", notify => Service['apache2'], }
+       ssl::service { 'lintian.debian.org'  : ensure => "ifstatic", notify => Service['apache2'], }
+       ssl::service { 'rtc.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
+       ssl::service { 'd-i.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
 
-       if has_static_component('news.debian.net'     ) { ssl::service { 'news.debian.net'     : notify => Service['apache2'], key => true, } }
-       if has_static_component('debaday.debian.net'  ) { ssl::service { 'debaday.debian.net'  : notify => Service['apache2'], key => true, } }
-       if has_static_component('timeline.debian.net' ) { ssl::service { 'timeline.debian.net' : notify => Service['apache2'], key => true, } }
-       if has_static_component('debconf0.debconf.org') { ssl::service { 'debconf0.debconf.org': notify => Service['apache2'], key => true, } }
-       if has_static_component('debconf1.debconf.org') { ssl::service { 'debconf1.debconf.org': notify => Service['apache2'], key => true, } }
-       if has_static_component('debconf2.debconf.org') { ssl::service { 'debconf2.debconf.org': notify => Service['apache2'], key => true, } }
-       if has_static_component('debconf3.debconf.org') { ssl::service { 'debconf3.debconf.org': notify => Service['apache2'], key => true, } }
-       if has_static_component('debconf4.debconf.org') { ssl::service { 'debconf4.debconf.org': notify => Service['apache2'], key => true, } }
-       if has_static_component('debconf5.debconf.org') { ssl::service { 'debconf5.debconf.org': notify => Service['apache2'], key => true, } }
-       if has_static_component('debconf6.debconf.org') { ssl::service { 'debconf6.debconf.org': notify => Service['apache2'], key => true, } }
-       if has_static_component('debconf7.debconf.org') { ssl::service { 'debconf7.debconf.org': notify => Service['apache2'], key => true, } }
+       # do
+       ssl::service { 'appstream.debian.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'backports.debian.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'blends.debian.org'             : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'release.debian.org'            : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'security-team.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'www.ports.debian.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       # dn
+       ssl::service { 'news.debian.net'               : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'debaday.debian.net'            : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'timeline.debian.net'           : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'wnpp-by-tags.debian.net'       : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       # dc
+       ssl::service { 'debconf0.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'debconf1.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'debconf2.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'debconf3.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'debconf4.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'debconf5.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'debconf6.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'debconf7.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { '10years.debconf.org'           : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'es.debconf.org'                : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'fr.debconf.org'                : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'miniconf10.debconf.org'        : ensure => "ifstatic", notify => Service['apache2'], key => true, }
 }