From 9449f3e23704eccabc4a619c707f3532ce1e0a9e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 19 Sep 2017 18:19:04 +0000 Subject: [PATCH] move budget to its own role and sync scripts --- playbooks/include/proxies-fedora-web.yml | 5 ++-- .../build/files/cron-budget-sync | 1 + .../build/files/cron-budget-sync.stg | 1 + roles/fedora-budget/build/tasks/main.yml | 24 +++++++++++++++++++ .../build/templates/budget-sync.j2 | 22 +++++++++++++++++ .../proxy}/files/budget.conf | 0 .../proxy}/files/cron-sync-budget | 0 .../proxy}/files/languages.conf | 0 .../proxy}/tasks/main.yml | 0 roles/fedora-web/build/files/syncStatic.sh | 13 ---------- .../fedora-web/build/files/syncStatic.stg.sh | 13 ---------- .../build/files/syncTranslations.sh | 1 - .../build/files/syncTranslations.stg.sh | 1 - 13 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 roles/fedora-budget/build/files/cron-budget-sync create mode 100644 roles/fedora-budget/build/files/cron-budget-sync.stg create mode 100644 roles/fedora-budget/build/tasks/main.yml create mode 100755 roles/fedora-budget/build/templates/budget-sync.j2 rename roles/{fedora-web/budget => fedora-budget/proxy}/files/budget.conf (100%) rename roles/{fedora-web/budget => fedora-budget/proxy}/files/cron-sync-budget (100%) rename roles/{fedora-web/budget => fedora-budget/proxy}/files/languages.conf (100%) rename roles/{fedora-web/budget => fedora-budget/proxy}/tasks/main.yml (100%) diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index f741362f93..2a674628dd 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -39,8 +39,6 @@ website: labs.fedoraproject.org - role: fedora-web/arm website: arm.fedoraproject.org - - role: fedora-web/budget - website: budget.fedoraproject.org - role: fedora-web/registry website: registry.fedoraproject.org - role: fedora-web/candidate-registry @@ -53,6 +51,9 @@ website: src.fedoraproject.org # Some other static content, not strictly part of "fedora-web" goes below here + - role: fedora-budget/proxy + website: budget.fedoraproject.org + - role: fedora-docs/proxy website: docs.fedoraproject.org diff --git a/roles/fedora-budget/build/files/cron-budget-sync b/roles/fedora-budget/build/files/cron-budget-sync new file mode 100644 index 0000000000..7df57ad5f0 --- /dev/null +++ b/roles/fedora-budget/build/files/cron-budget-sync @@ -0,0 +1 @@ +5 * * * * root /usr/local/bin/lock-wrapper budget-sync "/usr/local/bin/budget-sync | /usr/local/bin/nag-once budget-sync 1d 2>&1" diff --git a/roles/fedora-budget/build/files/cron-budget-sync.stg b/roles/fedora-budget/build/files/cron-budget-sync.stg new file mode 100644 index 0000000000..1d58f12477 --- /dev/null +++ b/roles/fedora-budget/build/files/cron-budget-sync.stg @@ -0,0 +1 @@ +*/5 * * * * root /usr/local/bin/lock-wrapper budget-sync "/usr/local/bin/budget-sync | /usr/local/bin/nag-once budget-sync 1d 2>&1" diff --git a/roles/fedora-budget/build/tasks/main.yml b/roles/fedora-budget/build/tasks/main.yml new file mode 100644 index 0000000000..48bd99e3b5 --- /dev/null +++ b/roles/fedora-budget/build/tasks/main.yml @@ -0,0 +1,24 @@ +- file: dest=/srv/web/budget.fedoraproject.org state=directory + +- template: > + src=budget-sync.j2 dest=/usr/local/bin/budget-sync + owner=root group=root mode=0755 + tags: + - fedora-budget + - fedora-budget/build + +- copy: > + src=cron-budget-sync dest=/etc/cron.d/budget-sync + owner=root group=root mode=0644 + tags: + - fedora-budget + - fedora-budget/build + when: env == "production" + +- copy: > + src=cron-budget-sync.stg dest=/etc/cron.d/budget-sync + owner=root group=root mode=0644 + tags: + - fedora-budget + - fedora-budget/build + when: env == "staging" diff --git a/roles/fedora-budget/build/templates/budget-sync.j2 b/roles/fedora-budget/build/templates/budget-sync.j2 new file mode 100755 index 0000000000..e24666a92a --- /dev/null +++ b/roles/fedora-budget/build/templates/budget-sync.j2 @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ ! -d /srv/web/budget.fedoraproject.org ] +then + echo "/srv/web/budget.fedoraproject.org missing" + cd /srv/web +{% if env == 'staging' %} + git clone -b stg https://pagure.io/fedora-budget-site.git budget.fedoraproject.org +{% else %} + git clone https://pagure.io/fedora-budget-site.git budget.fedoraproject.org +{% endif %} +fi + + +cd /srv/web/budget +/usr/bin/git reset -q --hard +{% if env == 'staging' %} +/usr/bin/git checkout -q stg +{% else %} +/usr/bin/git checkout -q prod +{% endif %} +/usr/bin/git pull -q --ff-only diff --git a/roles/fedora-web/budget/files/budget.conf b/roles/fedora-budget/proxy/files/budget.conf similarity index 100% rename from roles/fedora-web/budget/files/budget.conf rename to roles/fedora-budget/proxy/files/budget.conf diff --git a/roles/fedora-web/budget/files/cron-sync-budget b/roles/fedora-budget/proxy/files/cron-sync-budget similarity index 100% rename from roles/fedora-web/budget/files/cron-sync-budget rename to roles/fedora-budget/proxy/files/cron-sync-budget diff --git a/roles/fedora-web/budget/files/languages.conf b/roles/fedora-budget/proxy/files/languages.conf similarity index 100% rename from roles/fedora-web/budget/files/languages.conf rename to roles/fedora-budget/proxy/files/languages.conf diff --git a/roles/fedora-web/budget/tasks/main.yml b/roles/fedora-budget/proxy/tasks/main.yml similarity index 100% rename from roles/fedora-web/budget/tasks/main.yml rename to roles/fedora-budget/proxy/tasks/main.yml diff --git a/roles/fedora-web/build/files/syncStatic.sh b/roles/fedora-web/build/files/syncStatic.sh index c3bae6a0fa..8c5d6223cf 100644 --- a/roles/fedora-web/build/files/syncStatic.sh +++ b/roles/fedora-web/build/files/syncStatic.sh @@ -71,16 +71,3 @@ build fedoracommunity.org build fudcon.fedoraproject.org build start.fedoraproject.org build fedoraproject.org - -if [ ! -d /srv/web/budget.fedoraproject.org/.git ] -then - /usr/bin/git clone -q \ - https://pagure.io/fedora-budget-site.git \ - /srv/web/budget.fedoraproject.org -fi - -cd /srv/web/budget.fedoraproject.org -/usr/bin/git clean -q -fdx || exit 1 -/usr/bin/git reset -q --hard || exit 1 -/usr/bin/git checkout -q prod || exit 1 -/usr/bin/git pull -q --ff-only || exit 1 diff --git a/roles/fedora-web/build/files/syncStatic.stg.sh b/roles/fedora-web/build/files/syncStatic.stg.sh index 80b3f0fccc..ce6411a502 100644 --- a/roles/fedora-web/build/files/syncStatic.stg.sh +++ b/roles/fedora-web/build/files/syncStatic.stg.sh @@ -69,16 +69,3 @@ build fedoracommunity.org build fudcon.fedoraproject.org build start.fedoraproject.org build flocktofedora.org - -if [ ! -d /srv/web/budget.fedoraproject.org/.git ] -then - /usr/bin/git clone -q \ - https://pagure.io/fedora-budget-site.git \ - /srv/web/budget.fedoraproject.org -fi - -cd /srv/web/budget.fedoraproject.org -/usr/bin/git clean -q -fdx || exit 1 -/usr/bin/git reset -q --hard || exit 1 -/usr/bin/git checkout -q stg || exit 1 -/usr/bin/git pull -q --ff-only || exit 1 diff --git a/roles/fedora-web/build/files/syncTranslations.sh b/roles/fedora-web/build/files/syncTranslations.sh index d8467e33e9..ed33008c1c 100644 --- a/roles/fedora-web/build/files/syncTranslations.sh +++ b/roles/fedora-web/build/files/syncTranslations.sh @@ -12,7 +12,6 @@ SITES="alt.fedoraproject.org \ flocktofedora.org \ spins.fedoraproject.org \ labs.fedoraproject.org \ - budget.fedoraproject.org \ arm.fedoraproject.org \ start.fedoraproject.org" diff --git a/roles/fedora-web/build/files/syncTranslations.stg.sh b/roles/fedora-web/build/files/syncTranslations.stg.sh index d8467e33e9..ed33008c1c 100644 --- a/roles/fedora-web/build/files/syncTranslations.stg.sh +++ b/roles/fedora-web/build/files/syncTranslations.stg.sh @@ -12,7 +12,6 @@ SITES="alt.fedoraproject.org \ flocktofedora.org \ spins.fedoraproject.org \ labs.fedoraproject.org \ - budget.fedoraproject.org \ arm.fedoraproject.org \ start.fedoraproject.org"