From: Julien Cristau <jcristau@debian.org>
Date: Mon, 7 Oct 2019 15:11:35 +0000 (+0200)
Subject: move coccia to ubc
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3d1e20d9385fd27268e268d7d022b86ac6c905c5;p=mirror%2Fdsa-puppet.git

move coccia to ubc
---

diff --git a/modules/autofs/manifests/init.pp b/modules/autofs/manifests/init.pp
index 1c349232d..4fdbb44e3 100644
--- a/modules/autofs/manifests/init.pp
+++ b/modules/autofs/manifests/init.pp
@@ -1,12 +1,12 @@
 class autofs {
 	case $::hostname {
-		piu-slave-bm-a, picconi, coccia, dillon, quantz, sor, tate, respighi: {
+		piu-slave-bm-a, picconi, dillon, quantz, sor, tate, respighi: {
 			include autofs::bytemark
 		}
 		lw07,lw08: {
 			include autofs::leaseweb
 		}
-		tye,ullmann,piu-slave-ubc-01,hier,manziarly,lindsay,pinel,ticharich,donizetti,mekeel,pejacevic,delfin: {
+		tye,ullmann,piu-slave-ubc-01,hier,manziarly,lindsay,pinel,ticharich,donizetti,mekeel,pejacevic,delfin, coccia: {
 			include autofs::ubc
 		}
 	}
diff --git a/modules/roles/manifests/queued_to_ftpmaster.pp b/modules/roles/manifests/queued_to_ftpmaster.pp
index fb707981d..19a457b3e 100644
--- a/modules/roles/manifests/queued_to_ftpmaster.pp
+++ b/modules/roles/manifests/queued_to_ftpmaster.pp
@@ -4,4 +4,5 @@
 # for ftp-master.
 class roles::queued_to_ftpmaster {
   include roles::postgresql::ftp_master_dak_replica::db_guest_access::bm
+  include roles::postgresql::ftp_master_dak_replica::db_guest_access::ubc
 }
diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index c0b895223..af494a268 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -83,7 +83,7 @@ components:
     master: dillon.debian.org
     source: respighi.debian.org:/srv/release.debian.org/www
   release.debian.org-pu:
-    master: dillon.debian.org
+    master: static-master-ubc-01.debian.org
     source: coccia.debian.org:/srv/release.debian.org/www/proposed-updates
   rtc.debian.org:
     master: dillon.debian.org
@@ -101,7 +101,7 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/timeline.debian.net/htdocs
   backports.debian.org:
-    master: dillon.debian.org
+    master: static-master-ubc-01.debian.org
     source: coccia.debian.org:/srv/backports.debian.org/htdocs
   incoming.debian.org:
     master: fasolo.debian.org