From 8615fcd09f5d879f4758ac2006b23fa5e058d710 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 26 Jun 2017 18:45:53 +0000 Subject: [PATCH] and we have a tier1 --- inventory/group_vars/download | 2 +- inventory/inventory | 5 ++ .../rsyncd/templates/rsyncd.conf.download.j2 | 56 +++++++++---------- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/inventory/group_vars/download b/inventory/group_vars/download index 137cc40fab..640a283b15 100644 --- a/inventory/group_vars/download +++ b/inventory/group_vars/download @@ -1,5 +1,5 @@ --- -dl-tier1: +dl_tier1: - 71.19.151.18 # prgmr.com / nb.zone - 128.171.104.148 # mirror.ancl.hawaii.edu. - 129.101.198.59 # University of Idaho diff --git a/inventory/inventory b/inventory/inventory index 8327bbdd49..edef068885 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -337,6 +337,11 @@ download-ib01.fedoraproject.org [download-rdu2] download-rdu01.fedoraproject.org +[download_tier1] +download04.phx2.fedoraproject.org +download05.phx2.fedoraproject.org +download-rdu01.fedoraproject.org + [download:children] download-phx2 download-ibiblio diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index fc404b3e0f..b7595d54fc 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -20,78 +20,78 @@ refuse options = checksum [ fedora-alt ] comment = non-Fedora Alternative Content path = /srv/pub/alt - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [fedora-archive] comment = Fedora Release Archives path = /srv/pub/archive - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [ fedora-enchilada ] comment = Fedora - The whole enchilada path = /srv/pub/fedora - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [ fedora-buffet ] comment = Fedora - The whole buffet. All you can eat. path = /srv/pub - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [ fedora-epel ] comment = Extra Packages for Enterprise Linux path = /srv/pub/epel - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [ fedora-linux-releases ] comment = Fedora Linux Releases path = /srv/pub/fedora/linux/releases - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [ fedora-linux-development ] comment = Fedora Linux Development path = /srv/pub/fedora/linux/development - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [ fedora-linux-updates ] comment = Fedora Linux Updates path = /srv/pub/fedora/linux/updates - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [fedora-secondary] comment = Fedora Secondary Archs path = /srv/pub/fedora-secondary - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [ fedora-stage ] comment = Staging directory path = /srv/pub/alt/stage/ - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} [ fedora-live-respins ] comment = Fedora Live Respins path = /srv/pub/alt/live-respins - {% if host in groups['download-tier1'] %} - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + {% if host in groups['download_tier1'] %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} {% endif %} ## ## The following are not seen and are limited by IP. @@ -104,7 +104,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} [fedora-buffet0] comment = Fedora Buffet for Tier0|1 Mirrors @@ -112,7 +112,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} [fedora-epel0] @@ -121,7 +121,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} [fedora-alt0] @@ -130,7 +130,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} [fedora-archive0] @@ -139,7 +139,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} [fedora-compose0] @@ -148,7 +148,7 @@ refuse options = checksum list = no uid = nobody gid = nobody - hosts allow = {% for host in vars['dl-tier1'] %}{{host}},{% endfor %} + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} # For distributing applications