From 9d3706d64dc8ecd6f391aa4895c642bf5723d159 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 18 Feb 2020 20:24:35 +0000 Subject: [PATCH] remove boot.fedoraproject.org from proxy data files --- playbooks/include/proxies-fedora-web.yml | 2 -- playbooks/include/proxies-redirects.yml | 7 +++++++ playbooks/include/proxies-websites.yml | 6 ------ playbooks/manual/rebuild/websites.yml | 1 - roles/fedora-web/build/files/syncStatic.sh | 1 - roles/fedora-web/build/files/syncStatic.stg.sh | 1 - roles/fedora-web/build/files/syncTranslations.sh | 1 - roles/fedora-web/build/files/syncTranslations.stg.sh | 1 - roles/fedora-web/build/tasks/main.yml | 1 - roles/rsyncd/files/rsyncd.conf.sundries | 8 -------- roles/rsyncd/files/rsyncd.conf.sundries-stg | 8 -------- roles/web-data-analysis/files/run-daily-awstats.sh | 2 +- 12 files changed, 8 insertions(+), 31 deletions(-) diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index cda358f75e..79a6eee86e 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -19,8 +19,6 @@ website: spins.fedoraproject.org - role: fedora-web/start website: start.fedoraproject.org - - role: fedora-web/boot - website: boot.fedoraproject.org - role: fedora-web/mirrors website: mirrors.fedoraproject.org - role: fedora-web/communityblog diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index a15751d1a6..022fa7ac1e 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -561,6 +561,13 @@ website: pki.fedoraproject.org target: http://dogtagpki.org/ + # We no longer run boot + - role: httpd/redirect + shortname: boot + website: boot.fedoraproject.org + target: https://netboot.xyz/ + + # Cloudy bits - role: httpd/redirect shortname: cloud-front-page diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index e8c41dc850..5242a7843b 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -256,12 +256,6 @@ sslonly: true cert_name: "{{wildcard_cert_name}}" - - role: httpd/website - site_name: boot.fedoraproject.org - server_aliases: [boot.stg.fedoraproject.org] - sslonly: true - cert_name: "{{wildcard_cert_name}}" - - role: httpd/website site_name: smolts.org ssl: false diff --git a/playbooks/manual/rebuild/websites.yml b/playbooks/manual/rebuild/websites.yml index 2cad065451..f0969fa482 100644 --- a/playbooks/manual/rebuild/websites.yml +++ b/playbooks/manual/rebuild/websites.yml @@ -26,7 +26,6 @@ with_items: - getfedora.org - arm.fedoraproject.org - - boot.fedoraproject.org - fedoracommunity.org - developer.fedoraproject.org - fedoraproject.org diff --git a/roles/fedora-web/build/files/syncStatic.sh b/roles/fedora-web/build/files/syncStatic.sh index 25497c0025..8dd565c083 100644 --- a/roles/fedora-web/build/files/syncStatic.sh +++ b/roles/fedora-web/build/files/syncStatic.sh @@ -65,7 +65,6 @@ popd > /dev/null build flocktofedora.org build spins.fedoraproject.org -build boot.fedoraproject.org build fedoracommunity.org build fudcon.fedoraproject.org build start.fedoraproject.org diff --git a/roles/fedora-web/build/files/syncStatic.stg.sh b/roles/fedora-web/build/files/syncStatic.stg.sh index 7c86fbc245..a2250f5225 100644 --- a/roles/fedora-web/build/files/syncStatic.stg.sh +++ b/roles/fedora-web/build/files/syncStatic.stg.sh @@ -65,7 +65,6 @@ popd > /dev/null /usr/bin/git pull -q --ff-only || exit 1 build flocktofedora.org -build boot.fedoraproject.org build fedoracommunity.org build fudcon.fedoraproject.org build start.fedoraproject.org diff --git a/roles/fedora-web/build/files/syncTranslations.sh b/roles/fedora-web/build/files/syncTranslations.sh index ed33008c1c..b05eadbfff 100644 --- a/roles/fedora-web/build/files/syncTranslations.sh +++ b/roles/fedora-web/build/files/syncTranslations.sh @@ -4,7 +4,6 @@ PO_DIR=/var/tmp/po_dir SITES="alt.fedoraproject.org \ - boot.fedoraproject.org \ fedoracommunity.org \ fedorahosted.org \ fedoraproject.org \ diff --git a/roles/fedora-web/build/files/syncTranslations.stg.sh b/roles/fedora-web/build/files/syncTranslations.stg.sh index ed33008c1c..b05eadbfff 100644 --- a/roles/fedora-web/build/files/syncTranslations.stg.sh +++ b/roles/fedora-web/build/files/syncTranslations.stg.sh @@ -4,7 +4,6 @@ PO_DIR=/var/tmp/po_dir SITES="alt.fedoraproject.org \ - boot.fedoraproject.org \ fedoracommunity.org \ fedorahosted.org \ fedoraproject.org \ diff --git a/roles/fedora-web/build/tasks/main.yml b/roles/fedora-web/build/tasks/main.yml index 16a4a7458f..d6d6da3cec 100644 --- a/roles/fedora-web/build/tasks/main.yml +++ b/roles/fedora-web/build/tasks/main.yml @@ -35,7 +35,6 @@ with_items: - fedora-web - fedoraproject.org - - boot.fedoraproject.org - spins.fedoraproject.org - talk.fedoraproject.org - start.fedoraproject.org diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index 0b8a0b1071..8cdaefeedf 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -86,14 +86,6 @@ gid = root read only = yes hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0 -[boot.fedoraproject.org] -comment = boot.fedoraproject.org -path = /srv/web/boot.fedoraproject.org -uid = root -gid = root -read only = yes -hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0 - [mirrors.fedoraproject.org] comment = mirrors.fedoraproject.org path = /srv/web/mirrors.fedoraproject.org diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg index 0b8a0b1071..8cdaefeedf 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -86,14 +86,6 @@ gid = root read only = yes hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0 -[boot.fedoraproject.org] -comment = boot.fedoraproject.org -path = /srv/web/boot.fedoraproject.org -uid = root -gid = root -read only = yes -hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.255.255.0 - [mirrors.fedoraproject.org] comment = mirrors.fedoraproject.org path = /srv/web/mirrors.fedoraproject.org diff --git a/roles/web-data-analysis/files/run-daily-awstats.sh b/roles/web-data-analysis/files/run-daily-awstats.sh index c124a0ae18..11d00c7fa9 100644 --- a/roles/web-data-analysis/files/run-daily-awstats.sh +++ b/roles/web-data-analysis/files/run-daily-awstats.sh @@ -44,7 +44,7 @@ TREEDIR=${LOGDIR}/${YEAR}/${MONTH}/${DAY} AWSTATS=/usr/share/awstats/wwwroot/cgi-bin/awstats.pl HTMLDOC=/usr/bin/htmldoc -SITES="admin.fedoraproject.org apps.fedoraproject.org arm.fedoraproject.org ask.fedoraproject.org badges.fedoraproject.org bodhi.fedoraproject.org boot.fedoraproject.org budget.fedoraproject.org bugz.fedoraproject.org cloud.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org copr.fedoraproject.org developer.fedoraproject.org developers.fedoraproject.org docs.fedoraproject.org docs-old.fedoraproject.org download.fedoraproject.org fas.fedoraproject.org fedora.my fedoracommunity.org fedoramagazine.org fedoraproject.com fedoraproject.org flocktofedora.net flocktofedora.org fonts.fedoraproject.org fpaste.org fudcon.fedoraproject.org get.fedoraproject.org getfedora.org help.fedoraproject.org id.fedoraproject.org it.fedoracommunity.org join.fedoraproject.org k12linux.org kde.fedoraproject.org l10n.fedoraproject.org labs.fedoraproject.org lists.fedorahosted.org lists.fedoraproject.org meetbot-raw.fedoraproject.org meetbot.fedoraproject.org mirrors.fedoraproject.org nightly.fedoraproject.org osbs.fedoraproject.org paste.fedoraproject.org pdc.fedoraproject.org people.fedoraproject.org port389.org qa.fedoraproject.org redirect.fedoraproject.org registry.fedoraproject.org smolts.org spins.fedoraproject.org src.fedoraproject.org start.fedoraproject.org store.fedoraproject.org taskotron.fedoraproject.org translate.fedoraproject.org uk.fedoracommunity.org " +SITES="admin.fedoraproject.org apps.fedoraproject.org arm.fedoraproject.org ask.fedoraproject.org badges.fedoraproject.org bodhi.fedoraproject.org budget.fedoraproject.org bugz.fedoraproject.org cloud.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org copr.fedoraproject.org developer.fedoraproject.org developers.fedoraproject.org docs.fedoraproject.org docs-old.fedoraproject.org download.fedoraproject.org fas.fedoraproject.org fedora.my fedoracommunity.org fedoramagazine.org fedoraproject.com fedoraproject.org flocktofedora.net flocktofedora.org fonts.fedoraproject.org fpaste.org fudcon.fedoraproject.org get.fedoraproject.org getfedora.org help.fedoraproject.org id.fedoraproject.org it.fedoracommunity.org join.fedoraproject.org k12linux.org kde.fedoraproject.org l10n.fedoraproject.org labs.fedoraproject.org lists.fedorahosted.org lists.fedoraproject.org meetbot-raw.fedoraproject.org meetbot.fedoraproject.org mirrors.fedoraproject.org nightly.fedoraproject.org osbs.fedoraproject.org paste.fedoraproject.org pdc.fedoraproject.org people.fedoraproject.org port389.org qa.fedoraproject.org redirect.fedoraproject.org registry.fedoraproject.org smolts.org spins.fedoraproject.org src.fedoraproject.org start.fedoraproject.org store.fedoraproject.org taskotron.fedoraproject.org translate.fedoraproject.org uk.fedoracommunity.org " pushd ${CONFDIR} for SITE in ${SITES}; do