From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 18 Sep 2019 11:25:24 +0000 (+0200)
Subject: Revert "Use static-master-grnet-01 for incoming.ports.d.o"
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=3c9536406517ab5f0a46172e323b199acff2c61c

Revert "Use static-master-grnet-01 for incoming.ports.d.o"

This reverts commit 7f82f7567d9685920a00a2ac0e888e891b966b7b.

We use /srv/static.debian.org as the source for rsync
---

diff --git a/hieradata/nodes/porta.debian.org.yaml b/hieradata/nodes/porta.debian.org.yaml
index 3ccff770b..f044c0359 100644
--- a/hieradata/nodes/porta.debian.org.yaml
+++ b/hieradata/nodes/porta.debian.org.yaml
@@ -1,2 +1,3 @@
 classes:
+  - roles::static_master
   - roles::static_source
diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml
index bf2328f7c..34be32052 100644
--- a/modules/roles/misc/static-components.yaml
+++ b/modules/roles/misc/static-components.yaml
@@ -77,7 +77,7 @@ components:
     master: dillon.debian.org
     source: dillon.debian.org:/srv/news.debian.net/htdocs
   incoming.ports.debian.org:
-    master: static-master-grnet-01.debian.org
+    master: porta.debian.org
     source: porta.debian.org:/srv/ports-master.debian.org/queue/accepted
   release.debian.org:
     master: dillon.debian.org