Add micronews.debian.net static (re: #RT6364)

diff --git a/modules/roles/manifests/onionbalance.pp b/modules/roles/manifests/onionbalance.pp
index ec870b4..6771ad4 100644 (file)
--- a/modules/roles/manifests/onionbalance.pp
+++ b/modules/roles/manifests/onionbalance.pp
@@ -18,6 +18,7 @@ class roles::onionbalance {
        # dn
        onion::balance_service { 'news.debian.net': }
        onion::balance_service { 'debaday.debian.net': }
+       onion::balance_service { 'micronews.debian.net': }
        onion::balance_service { 'timeline.debian.net': }
        onion::balance_service { 'wnpp-by-tags.debian.net': }
        # dc

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 4b042eb..fea09d6 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -96,6 +96,7 @@ class roles::static_mirror {
        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 { 'micronews.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, }
@@ -135,6 +136,7 @@ class roles::static_mirror {
                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 { 'debaday.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 }

diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 3cba2f9..caa88e6 100644 (file)
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -37,6 +37,9 @@ components:
   mozilla.debian.net:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/mozilla.debian.net/htdocs
+  micronews.debian.net:
+    master: dillon.debian.org
+    source: dillon.debian.org:/srv/micronews.debian.net/htdocs
   news.debian.net:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/news.debian.net/htdocs

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 983264e..e6d0fe3 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -62,6 +62,7 @@ vhost(lines, "rtc.debian.org"      , "ssl")
 vhost(lines, "onion.debian.org"    , "ssl")
 
 vhost(lines, "bits.debian.org", "ssl-with-extra")
+vhost(lines, "micronews.debian.net", "ssl")
 vhost(lines, "metadata.ftp-master.debian.org", "with-extra")
 
 vhost(lines, "10years.debconf.org" , "ssl")

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index ea2342b..1a328b4 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -185,6 +185,7 @@ dsa         dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component dsa.d
 dak            franck=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component incoming.debian.org
 dak            franck=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component metadata.ftp-master.debian.org
 %publicity     master=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component bits.debian.org
+%publicity     dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component micronews.debian.net
 %debdelta      donizetti=(staticsync)          NOPASSWD: /usr/local/bin/static-update-component debdeltas.debian.net
 %webwml                master=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component network-test.debian.org
 planet         philp=(staticsync)              NOPASSWD: /usr/local/bin/static-update-component planet.debian.org