From 870eee6e99f10b7dbbba20d7a5075754fb6bad14 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 18 Feb 2020 22:01:31 +0000 Subject: [PATCH] Revert "remove boot.fedoraproject.org from proxy data files" This reverts commit d6ecabe44506a1ca82125e17d1dc6a7f05ac7a2a. --- 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, 31 insertions(+), 8 deletions(-) diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 79a6eee86e..cda358f75e 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -19,6 +19,8 @@ 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 022fa7ac1e..a15751d1a6 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -561,13 +561,6 @@ 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 5242a7843b..e8c41dc850 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -256,6 +256,12 @@ 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 f0969fa482..2cad065451 100644 --- a/playbooks/manual/rebuild/websites.yml +++ b/playbooks/manual/rebuild/websites.yml @@ -26,6 +26,7 @@ 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 8dd565c083..25497c0025 100644 --- a/roles/fedora-web/build/files/syncStatic.sh +++ b/roles/fedora-web/build/files/syncStatic.sh @@ -65,6 +65,7 @@ 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 a2250f5225..7c86fbc245 100644 --- a/roles/fedora-web/build/files/syncStatic.stg.sh +++ b/roles/fedora-web/build/files/syncStatic.stg.sh @@ -65,6 +65,7 @@ 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 b05eadbfff..ed33008c1c 100644 --- a/roles/fedora-web/build/files/syncTranslations.sh +++ b/roles/fedora-web/build/files/syncTranslations.sh @@ -4,6 +4,7 @@ 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 b05eadbfff..ed33008c1c 100644 --- a/roles/fedora-web/build/files/syncTranslations.stg.sh +++ b/roles/fedora-web/build/files/syncTranslations.stg.sh @@ -4,6 +4,7 @@ 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 d6d6da3cec..16a4a7458f 100644 --- a/roles/fedora-web/build/tasks/main.yml +++ b/roles/fedora-web/build/tasks/main.yml @@ -35,6 +35,7 @@ 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 8cdaefeedf..0b8a0b1071 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -86,6 +86,14 @@ 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 8cdaefeedf..0b8a0b1071 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -86,6 +86,14 @@ 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 11d00c7fa9..c124a0ae18 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 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 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 " pushd ${CONFDIR} for SITE in ${SITES}; do