From 3cf3f44356925f341ce76c9454aa4c6db8109b22 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 27 Aug 2016 18:45:27 +0200 Subject: [PATCH] sort --- modules/roles/manifests/static_mirror.pp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index abf5d490a..eedb61363 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -88,32 +88,32 @@ class roles::static_mirror { ssl::service { 'backports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'bits.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'blends.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } - ssl::service { 'lintian.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'incoming.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'incoming.ports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'lintian.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'onion.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'release.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'security-team.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'www.ports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } # dn - ssl::service { 'news.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'debaday.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debdeltas.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'micronews.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'mozilla.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } - ssl::service { 'debaday.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'news.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'timeline.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } # dc + ssl::service { '10years.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf0.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf1.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'debconf16.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf2.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf3.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf4.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf5.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf6.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf7.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } - ssl::service { 'debconf16.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } - ssl::service { '10years.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'es.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'fr.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'miniconf10.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } @@ -123,10 +123,10 @@ class roles::static_mirror { fail("Do not have an onion_v4_addr set for $::hostname.") } + onion::service { 'd-i.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'dsa.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { 'www.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'rtc.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { 'd-i.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'www.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } # do onion::service { 'appstream.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } @@ -141,24 +141,24 @@ class roles::static_mirror { onion::service { 'security-team.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'www.ports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } # dn - onion::service { 'news.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { 'micronews.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { 'mozilla.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debaday.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debdeltas.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'micronews.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'mozilla.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'news.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'timeline.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } # dc + onion::service { '10years.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf0.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf1.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'debconf16.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf2.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf3.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf4.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf5.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf6.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debconf7.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { 'debconf16.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { '10years.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'es.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'fr.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'miniconf10.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } -- 2.20.1