From ed7984ef1f1ab6c9084d27d7a07b68f9623afe88 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Jul 2015 22:55:32 +0000 Subject: [PATCH] Switch all these sync jobs to pull from sundries01 instead of bapp02. Will test out on one proxy first, then push to the rest. --- roles/fedora-docs/proxy/files/cron-docs-rsync | 2 +- roles/fedora-docs/proxy/files/docs-rsync | 2 +- roles/fedora-web/arm/files/cron-sync-arm | 2 +- roles/fedora-web/boot/files/cron-sync-boot | 2 +- roles/fedora-web/build/files/syncStatic.sh | 2 +- roles/fedora-web/build/files/syncStatic.stg.sh | 2 +- roles/fedora-web/community/files/cron-sync-community | 2 +- roles/fedora-web/fudcon/files/cron-sync-fudcon | 2 +- roles/fedora-web/getfedora/files/cron-sync-getfedora | 2 +- roles/fedora-web/labs/files/cron-sync-labs | 2 +- roles/fedora-web/main/files/cron-sync-fedora-web | 2 +- roles/fedora-web/mirrors/files/cron-sync-mirrors | 2 +- roles/fedora-web/spins/files/cron-sync-spins | 2 +- roles/fedora-web/start/files/cron-sync-start | 2 +- roles/membership-map/proxy/files/sync-membership-map.cron | 2 +- roles/review-stats/proxy/files/sync-review-stats.cron | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/roles/fedora-docs/proxy/files/cron-docs-rsync b/roles/fedora-docs/proxy/files/cron-docs-rsync index 5f7d02db3a..daae988d8c 100644 --- a/roles/fedora-docs/proxy/files/cron-docs-rsync +++ b/roles/fedora-docs/proxy/files/cron-docs-rsync @@ -1,2 +1,2 @@ # TODO: Make add some locking to this. -10 * * * * root /usr/bin/rsync --delete -aSHPq --exclude=.git/objects/ bapp02::docs/ /srv/web/docs.fedoraproject.org/ +10 * * * * root /usr/bin/rsync --delete -aSHPq --exclude=.git/objects/ sundries01::docs/ /srv/web/docs.fedoraproject.org/ diff --git a/roles/fedora-docs/proxy/files/docs-rsync b/roles/fedora-docs/proxy/files/docs-rsync index 28ef854d95..e90d9b713e 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync +++ b/roles/fedora-docs/proxy/files/docs-rsync @@ -1,3 +1,3 @@ #!/bin/sh -/usr/bin/rsync -aSHPv --delete --exclude=.git/objects/ bapp02::docs/ /srv/web/docs.fedoraproject.org/ +/usr/bin/rsync -aSHPv --delete --exclude=.git/objects/ sundries01::docs/ /srv/web/docs.fedoraproject.org/ diff --git a/roles/fedora-web/arm/files/cron-sync-arm b/roles/fedora-web/arm/files/cron-sync-arm index 64f723b66c..b8b7681e69 100644 --- a/roles/fedora-web/arm/files/cron-sync-arm +++ b/roles/fedora-web/arm/files/cron-sync-arm @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::arm.fedoraproject.org/ /srv/web/arm.fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::arm.fedoraproject.org/ /srv/web/arm.fedoraproject.org/ diff --git a/roles/fedora-web/boot/files/cron-sync-boot b/roles/fedora-web/boot/files/cron-sync-boot index 7d361c1385..bef05c72e3 100644 --- a/roles/fedora-web/boot/files/cron-sync-boot +++ b/roles/fedora-web/boot/files/cron-sync-boot @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::boot.fedoraproject.org/ /srv/web/boot.fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::boot.fedoraproject.org/ /srv/web/boot.fedoraproject.org/ diff --git a/roles/fedora-web/build/files/syncStatic.sh b/roles/fedora-web/build/files/syncStatic.sh index 101462588b..29ae94d9b3 100644 --- a/roles/fedora-web/build/files/syncStatic.sh +++ b/roles/fedora-web/build/files/syncStatic.sh @@ -33,7 +33,7 @@ fi # Freeze the website to prepare beta changes. On release day, comment the git # checkout line below, run this script, and use: -# sudo func proxy\* call command run "/usr/bin/rsync -a --no-owner --no-group bapp02::fedoraproject.org/* /srv/web/fedoraproject.org/" +# sudo func proxy\* call command run "/usr/bin/rsync -a --no-owner --no-group sundries01::fedoraproject.org/* /srv/web/fedoraproject.org/" # on puppet1 to update the website. # # For any other last-minute changes or fixes, make the necessary changes in the diff --git a/roles/fedora-web/build/files/syncStatic.stg.sh b/roles/fedora-web/build/files/syncStatic.stg.sh index bd1edf842c..76ebe265cf 100644 --- a/roles/fedora-web/build/files/syncStatic.stg.sh +++ b/roles/fedora-web/build/files/syncStatic.stg.sh @@ -33,7 +33,7 @@ fi # Freeze the website to prepare beta changes. On release day, comment the git # checkout line below, run this script, and use: -# sudo func proxy\* call command run "/usr/bin/rsync -a --no-owner --no-group bapp02::fedoraproject.org/* /srv/web/fedoraproject.org/" +# sudo func proxy\* call command run "/usr/bin/rsync -a --no-owner --no-group sundries01::fedoraproject.org/* /srv/web/fedoraproject.org/" # on puppet1 to update the website. # # For any other last-minute changes or fixes, make the necessary changes in the diff --git a/roles/fedora-web/community/files/cron-sync-community b/roles/fedora-web/community/files/cron-sync-community index 5260dfc465..39069b619b 100644 --- a/roles/fedora-web/community/files/cron-sync-community +++ b/roles/fedora-web/community/files/cron-sync-community @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::fedoracommunity.org/ /srv/web/fedoracommunity.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::fedoracommunity.org/ /srv/web/fedoracommunity.org/ diff --git a/roles/fedora-web/fudcon/files/cron-sync-fudcon b/roles/fedora-web/fudcon/files/cron-sync-fudcon index 6ac884ba67..d687efa8ec 100644 --- a/roles/fedora-web/fudcon/files/cron-sync-fudcon +++ b/roles/fedora-web/fudcon/files/cron-sync-fudcon @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::fudcon.fedoraproject.org/ /srv/web/fudcon.fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::fudcon.fedoraproject.org/ /srv/web/fudcon.fedoraproject.org/ diff --git a/roles/fedora-web/getfedora/files/cron-sync-getfedora b/roles/fedora-web/getfedora/files/cron-sync-getfedora index 651f98acb1..8de6dbd5bb 100644 --- a/roles/fedora-web/getfedora/files/cron-sync-getfedora +++ b/roles/fedora-web/getfedora/files/cron-sync-getfedora @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::getfedora.org/ /srv/web/getfedora.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::getfedora.org/ /srv/web/getfedora.org/ diff --git a/roles/fedora-web/labs/files/cron-sync-labs b/roles/fedora-web/labs/files/cron-sync-labs index 18b2dd06e0..c078a60039 100644 --- a/roles/fedora-web/labs/files/cron-sync-labs +++ b/roles/fedora-web/labs/files/cron-sync-labs @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::labs.fedoraproject.org/ /srv/web/labs.fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::labs.fedoraproject.org/ /srv/web/labs.fedoraproject.org/ diff --git a/roles/fedora-web/main/files/cron-sync-fedora-web b/roles/fedora-web/main/files/cron-sync-fedora-web index ae25a6f548..a3c7406cc1 100644 --- a/roles/fedora-web/main/files/cron-sync-fedora-web +++ b/roles/fedora-web/main/files/cron-sync-fedora-web @@ -1,2 +1,2 @@ # TODO: Make add some locking to this. -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::fedoraproject.org/ /srv/web/fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::fedoraproject.org/ /srv/web/fedoraproject.org/ diff --git a/roles/fedora-web/mirrors/files/cron-sync-mirrors b/roles/fedora-web/mirrors/files/cron-sync-mirrors index e50f7fe774..96e52cfb96 100644 --- a/roles/fedora-web/mirrors/files/cron-sync-mirrors +++ b/roles/fedora-web/mirrors/files/cron-sync-mirrors @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::mirrors.fedoraproject.org/ /srv/web/mirrors.fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::mirrors.fedoraproject.org/ /srv/web/mirrors.fedoraproject.org/ diff --git a/roles/fedora-web/spins/files/cron-sync-spins b/roles/fedora-web/spins/files/cron-sync-spins index 38afba948c..b221894c44 100644 --- a/roles/fedora-web/spins/files/cron-sync-spins +++ b/roles/fedora-web/spins/files/cron-sync-spins @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::spins.fedoraproject.org/ /srv/web/spins.fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::spins.fedoraproject.org/ /srv/web/spins.fedoraproject.org/ diff --git a/roles/fedora-web/start/files/cron-sync-start b/roles/fedora-web/start/files/cron-sync-start index 07ebf7905f..714efdf3b3 100644 --- a/roles/fedora-web/start/files/cron-sync-start +++ b/roles/fedora-web/start/files/cron-sync-start @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group bapp02::start.fedoraproject.org/ /srv/web/start.fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::start.fedoraproject.org/ /srv/web/start.fedoraproject.org/ diff --git a/roles/membership-map/proxy/files/sync-membership-map.cron b/roles/membership-map/proxy/files/sync-membership-map.cron index 5b1cb0fb67..14280d2683 100644 --- a/roles/membership-map/proxy/files/sync-membership-map.cron +++ b/roles/membership-map/proxy/files/sync-membership-map.cron @@ -1 +1 @@ -10,40 * * * * root /usr/bin/rsync -a --delete bapp02::membership-map/* /srv/web/membership-map/ >& /dev/null +10,40 * * * * root /usr/bin/rsync -a --delete sundries01::membership-map/* /srv/web/membership-map/ >& /dev/null diff --git a/roles/review-stats/proxy/files/sync-review-stats.cron b/roles/review-stats/proxy/files/sync-review-stats.cron index 168fcc80fd..0816816ff6 100644 --- a/roles/review-stats/proxy/files/sync-review-stats.cron +++ b/roles/review-stats/proxy/files/sync-review-stats.cron @@ -1 +1 @@ -3,33 * * * * root /usr/bin/rsync -a --delete bapp02::review-stats/* /srv/web/review-stats/ >& /dev/null +3,33 * * * * root /usr/bin/rsync -a --delete sundries01::review-stats/* /srv/web/review-stats/ >& /dev/null