I tried to make format-patch work but I have some problems in places still in my setup :/
From 49ab54526b57d0cde534b2887a4e77cf021090ea Mon Sep 17 00:00:00 2001 From: Stephen Smoogen smooge@redhat.com Date: Mon, 11 Mar 2019 22:39:30 +0000 Subject: [Freeze Break Request] FBR: rsyncd/download servers Add dotsrc to tier1 To: infrastructure@lists.fedoraproject.org
Add dotsrc to tier1 so that europe has another large mirror. --- inventory/group_vars/download | 2 ++ roles/rsyncd/templates/rsyncd.conf.download.j2 | 10 ++++++++++ 2 files changed, 12 insertions(+)
diff --git a/inventory/group_vars/download b/inventory/group_vars/download index 7d3fe98..a806797 100644 --- a/inventory/group_vars/download +++ b/inventory/group_vars/download @@ -70,3 +70,5 @@ dl_tier1: - 147.75.69.165 # sjc.edge.kernel.org - 147.75.197.195 # ewr.edge.kernel.org - 147.75.101.1 # ams.edge.kernel.org + - 130.225.254.116 # dotsrc.org + - 2001:878:346::116 # dotsrc.org diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index 9a7b0fc..aa2f8f0 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -149,6 +149,7 @@ refuse options = checksum gid = 263 hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %}
+{% if datacenter == 'phx2' %} [fedora-compose0] comment = Fedora composes path = /mnt/koji/compose @@ -156,7 +157,16 @@ refuse options = checksum uid = nobody gid = nobody hosts allow = 10.0.0.0/8, 209.132.0.0/16 +{% endif %}
+{% if inventory_hostname == 'download-cc-rdu01.fedoraproject.org' %} +[centos] + comment = CentOS + path = /srv/pub/centos + list = no + uid = nobody + gid = nobody +{% endif %}
# For distributing applications [log]
On 3/11/19 3:43 PM, Stephen John Smoogen wrote:
I tried to make format-patch work but I have some problems in places still in my setup :/
From 49ab54526b57d0cde534b2887a4e77cf021090ea Mon Sep 17 00:00:00 2001 From: Stephen Smoogen smooge@redhat.com Date: Mon, 11 Mar 2019 22:39:30 +0000 Subject: [Freeze Break Request] FBR: rsyncd/download servers Add dotsrc to tier1 To: infrastructure@lists.fedoraproject.org
Add dotsrc to tier1 so that europe has another large mirror.
+1, but a question below...
inventory/group_vars/download | 2 ++ roles/rsyncd/templates/rsyncd.conf.download.j2 | 10 ++++++++++ 2 files changed, 12 insertions(+)
diff --git a/inventory/group_vars/download b/inventory/group_vars/download index 7d3fe98..a806797 100644 --- a/inventory/group_vars/download +++ b/inventory/group_vars/download @@ -70,3 +70,5 @@ dl_tier1:
- 147.75.69.165 # sjc.edge.kernel.org
- 147.75.197.195 # ewr.edge.kernel.org
- 147.75.101.1 # ams.edge.kernel.org
- 130.225.254.116 # dotsrc.org
- 2001:878:346::116 # dotsrc.org
diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index 9a7b0fc..aa2f8f0 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -149,6 +149,7 @@ refuse options = checksum gid = 263 hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %}
+{% if datacenter == 'phx2' %} [fedora-compose0] comment = Fedora composes path = /mnt/koji/compose @@ -156,7 +157,16 @@ refuse options = checksum uid = nobody gid = nobody hosts allow = 10.0.0.0/8, 209.132.0.0/16 +{% endif %}
Is this below intended to be part of this? I guess it's a open centos rsync target? Not a issue, just didn't seem like it was related to the mirror above.
kevin
+{% if inventory_hostname == 'download-cc-rdu01.fedoraproject.org' %} +[centos]
comment = CentOS
path = /srv/pub/centos
list = no
uid = nobody
gid = nobody
+{% endif %}
# For distributing applications [log]
Like Kevin, I think that the patch may contain unrelated change.
+1 to the part changing inventory/group_vars/download +0 to the part changing roles/rsyncd
On Mon, Mar 11, 2019 at 11:44 PM Stephen John Smoogen smooge@gmail.com wrote:
I tried to make format-patch work but I have some problems in places still in my setup :/
From 49ab54526b57d0cde534b2887a4e77cf021090ea Mon Sep 17 00:00:00 2001 From: Stephen Smoogen smooge@redhat.com Date: Mon, 11 Mar 2019 22:39:30 +0000 Subject: [Freeze Break Request] FBR: rsyncd/download servers Add dotsrc to tier1 To: infrastructure@lists.fedoraproject.org
Add dotsrc to tier1 so that europe has another large mirror.
inventory/group_vars/download | 2 ++ roles/rsyncd/templates/rsyncd.conf.download.j2 | 10 ++++++++++ 2 files changed, 12 insertions(+)
diff --git a/inventory/group_vars/download b/inventory/group_vars/download index 7d3fe98..a806797 100644 --- a/inventory/group_vars/download +++ b/inventory/group_vars/download @@ -70,3 +70,5 @@ dl_tier1:
- 147.75.69.165 # sjc.edge.kernel.org
- 147.75.197.195 # ewr.edge.kernel.org
- 147.75.101.1 # ams.edge.kernel.org
- 130.225.254.116 # dotsrc.org
- 2001:878:346::116 # dotsrc.org
diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index 9a7b0fc..aa2f8f0 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -149,6 +149,7 @@ refuse options = checksum gid = 263 hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %}
+{% if datacenter == 'phx2' %} [fedora-compose0] comment = Fedora composes path = /mnt/koji/compose @@ -156,7 +157,16 @@ refuse options = checksum uid = nobody gid = nobody hosts allow = 10.0.0.0/8, 209.132.0.0/16 +{% endif %}
+{% if inventory_hostname == 'download-cc-rdu01.fedoraproject.org' %} +[centos]
comment = CentOS
path = /srv/pub/centos
list = no
uid = nobody
gid = nobody
+{% endif %}
# For distributing applications [log] -- 1.8.3.1
-- Stephen J Smoogen. _______________________________________________ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedorapro...
On Tue, 12 Mar 2019 at 04:12, Mikolaj Izdebski mizdebsk@redhat.com wrote:
Like Kevin, I think that the patch may contain unrelated change.
+1 to the part changing inventory/group_vars/download +0 to the part changing roles/rsyncd
Ooof. that was supposed to go later. The centos server side needs to be closed off to just the 8 network so I need to do that as a different FBR.
On Mon, Mar 11, 2019 at 11:44 PM Stephen John Smoogen smooge@gmail.com wrote:
I tried to make format-patch work but I have some problems in places still in my setup :/
From 49ab54526b57d0cde534b2887a4e77cf021090ea Mon Sep 17 00:00:00 2001 From: Stephen Smoogen smooge@redhat.com Date: Mon, 11 Mar 2019 22:39:30 +0000 Subject: [Freeze Break Request] FBR: rsyncd/download servers Add dotsrc to tier1 To: infrastructure@lists.fedoraproject.org
Add dotsrc to tier1 so that europe has another large mirror.
inventory/group_vars/download | 2 ++ roles/rsyncd/templates/rsyncd.conf.download.j2 | 10 ++++++++++ 2 files changed, 12 insertions(+)
diff --git a/inventory/group_vars/download b/inventory/group_vars/download index 7d3fe98..a806797 100644 --- a/inventory/group_vars/download +++ b/inventory/group_vars/download @@ -70,3 +70,5 @@ dl_tier1:
- 147.75.69.165 # sjc.edge.kernel.org
- 147.75.197.195 # ewr.edge.kernel.org
- 147.75.101.1 # ams.edge.kernel.org
- 130.225.254.116 # dotsrc.org
- 2001:878:346::116 # dotsrc.org
diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index 9a7b0fc..aa2f8f0 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -149,6 +149,7 @@ refuse options = checksum gid = 263 hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %}
+{% if datacenter == 'phx2' %} [fedora-compose0] comment = Fedora composes path = /mnt/koji/compose @@ -156,7 +157,16 @@ refuse options = checksum uid = nobody gid = nobody hosts allow = 10.0.0.0/8, 209.132.0.0/16 +{% endif %}
+{% if inventory_hostname == 'download-cc-rdu01.fedoraproject.org' %} +[centos]
comment = CentOS
path = /srv/pub/centos
list = no
uid = nobody
gid = nobody
+{% endif %}
# For distributing applications [log] -- 1.8.3.1
-- Stephen J Smoogen. _______________________________________________ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedorapro...
infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedorapro...
infrastructure@lists.fedoraproject.org