Also temporarily remove TLSA records for *.dgit and appstream

Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp
index 50b1226..eb463fb 100644 (file)
--- a/modules/roles/manifests/dgit_browse.pp
+++ b/modules/roles/manifests/dgit_browse.pp
@@ -1,6 +1,7 @@
 class roles::dgit_browse {
        ssl::service { 'browse.dgit.debian.org':
                notify => Service['apache2'],
+               tlsaport => [],
        }
 
        package { 'cgit': ensure => installed, }

diff --git a/modules/roles/manifests/dgit_git.pp b/modules/roles/manifests/dgit_git.pp
index 9c8b5f0..8614b18 100644 (file)
--- a/modules/roles/manifests/dgit_git.pp
+++ b/modules/roles/manifests/dgit_git.pp
@@ -1,6 +1,7 @@
 class roles::dgit_git {
        ssl::service { 'git.dgit.debian.org':
                notify => Service['apache2'],
+               tlsaport => [],
        }
 
        apache2::site { '010-git.dgit.debian.org':

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 3ed49ce..55c091c 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -77,7 +77,7 @@ class roles::static_mirror {
        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 { 'appstream.debian.org': ensure => "ifstatic", notify => Service['apache2'], }
+       ssl::service { 'appstream.debian.org': ensure => "ifstatic", notify => Service['apache2'], tlsaport => [], }
        ssl::service { 'd-i.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
 
        # do