add onion.d.o

diff --git a/modules/roles/manifests/onionbalance.pp b/modules/roles/manifests/onionbalance.pp
index 9f7c923..12fbc63 100644 (file)
--- a/modules/roles/manifests/onionbalance.pp
+++ b/modules/roles/manifests/onionbalance.pp
@@ -11,6 +11,7 @@ class roles::onionbalance {
        onion::balance_service { 'bits.debian.org': }
        onion::balance_service { 'blends.debian.org': }
        onion::balance_service { 'lintian.debian.org': }
+       onion::balance_service { 'onion.debian.org': }
        onion::balance_service { 'release.debian.org': }
        onion::balance_service { 'security-team.debian.org': }
        onion::balance_service { 'www.ports.debian.org': }

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9be78c4..3675285 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -87,9 +87,10 @@ class roles::static_mirror {
        # 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 { 'bits.debian.org'               : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'onion.debian.org'              : ensure => "ifstatic", notify => Service['apache2'], key => true, }
        ssl::service { 'blends.debian.org'             : ensure => "ifstatic", notify => Service['apache2'], key => true, }
        ssl::service { 'lintian.debian.org'            : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+       ssl::service { 'bits.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, }
@@ -128,6 +129,7 @@ class roles::static_mirror {
                onion::service { 'bits.debian.org'               : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'blends.debian.org'             : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'lintian.debian.org'            : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
+               onion::service { 'onion.debian.org'              : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                onion::service { 'release.debian.org'            : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
                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 }

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index e46e08c..3cba2f9 100644 (file)
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -73,6 +73,9 @@ components:
   metadata.ftp-master.debian.org:
     master: franck.debian.org
     source: franck.debian.org:/srv/ftp-master.debian.org/export
+  onion.debian.org:
+    master: dillon.debian.org
+    source: dillon.debian.org:/srv/onion-master.debian.org/htdocs
   10years.debconf.org   : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/10years.debconf.org' }
   debconf0.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf0.debconf.org' }
   debconf1.debconf.org  : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf1.debconf.org' }

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index ef643c9..983264e 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -59,6 +59,7 @@ vhost(lines, "d-i.debian.org"      , "ssl")
 vhost(lines, "appstream.debian.org", "ssl")
 vhost(lines, "dsa.debian.org"      , "ssl")
 vhost(lines, "rtc.debian.org"      , "ssl")
+vhost(lines, "onion.debian.org"    , "ssl")
 
 vhost(lines, "bits.debian.org", "ssl-with-extra")
 vhost(lines, "metadata.ftp-master.debian.org", "with-extra")