From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 21 Sep 2016 22:52:34 +0000 (+0200)
Subject: Replace micronews.debian.net by micronews.debian.org
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6c42f08dd9aea2a4a0ab84ecd4496ea295f4dc6e;p=mirror%2Fdsa-puppet.git

Replace micronews.debian.net by micronews.debian.org

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 0bed34860..e6a65d265 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -99,7 +99,7 @@ class roles::static_mirror {
 	ssl::service { 'bootstrap.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 { 'micronews.debian.org'          : 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 { '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, }
@@ -145,7 +145,7 @@ class roles::static_mirror {
 		onion::service { 'bootstrap.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 { 'micronews.debian.org'          : 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 }
diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index 18fce0969..06374aee5 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -42,9 +42,9 @@ components:
   mozilla.debian.net:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/mozilla.debian.net/htdocs
-  micronews.debian.net:
+  micronews.debian.org:
     master: dillon.debian.org
-    source: dillon.debian.org:/srv/micronews.debian.net/htdocs
+    source: dillon.debian.org:/srv/micronews.debian.org/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 ad829e29a..198ea2a6d 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -157,7 +157,7 @@ vhost(lines, "rtc.debian.org"                , :ssl => true)
 vhost(lines, "onion.debian.org"              , :ssl => true)
 
 vhost(lines, "bits.debian.org"               , :ssl => true, :extra => true)
-vhost(lines, "micronews.debian.net"          , :ssl => true)
+vhost(lines, "micronews.debian.org"          , :ssl => true)
 vhost(lines, "metadata.ftp-master.debian.org", :extra => true)
 
 vhost(lines, "10years.debconf.org"           , :ssl => true)
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index ded4ac915..bdd77d7e2 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -187,7 +187,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	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component bits.debian.org
-%publicity	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component micronews.debian.net
+%publicity	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component micronews.debian.org
 %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