From: Julien Cristau Date: Mon, 20 Jun 2016 07:53:50 +0000 (+0200) Subject: Also temporarily remove TLSA records for *.dgit and appstream X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4efdf3c828fad27cc3ce9697fcbf17084d619509;p=mirror%2Fdsa-puppet.git Also temporarily remove TLSA records for *.dgit and appstream Signed-off-by: Julien Cristau --- diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp index 50b122677..eb463fbad 100644 --- 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 9c8b5f063..8614b185e 100644 --- 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 3ed49ced3..55c091c3c 100644 --- 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