Greetings. Some background/history: For ages we have had the fedora-web sites. These sites are in one git repo in pagure and we have build roles for them on sundries servers. This checks out the source from git and builds the site and then the proxies sync it and serve it as static content. A while back the budget site (which was under fedora-web) moved out of it as a proof of concept of a new docs workflow. In this flow their is a git repo for the source, and another git repo with the finished built static site and on our sundries servers we just pull the built site and proxies sync it and serve it as static content. There's no building on our side it's all done. When budget moved it was kind of a proof of concept, so I just tweaked the fedora-web build script to also pull that site. However, it really should be it's own role and not tied to fedora-web or that process. Finally the request in ticket https://pagure.io/fedora-infrastructure/issue/6371 to build the staging budget site faster, which would require moving it out of the fedora-web scripts. I'd like to make this change. It should be almost no change in production aside from removing it from the fedora-web build script and adding it's own git pull script and cron job (all contents will be the same as will the update freq). In staging it will be the same, but updating faster. +1s? kevin -- diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index f741362..2a67462 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 0000000..7df57ad --- /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 0000000..1d58f12 --- /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 0000000..48bd99e --- /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 0000000..e24666a --- /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-budget/proxy/files/budget.conf b/roles/fedora-budget/proxy/files/budget.conf new file mode 100644 index 0000000..17c01d1 --- /dev/null +++ b/roles/fedora-budget/proxy/files/budget.conf @@ -0,0 +1,9 @@ +DocumentRoot /srv/web/budget.fedoraproject.org +Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico + +AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript + +FileETag MTime Size + +ExpiresActive On +ExpiresDefault "access plus 30 minutes" diff --git a/roles/fedora-budget/proxy/files/cron-sync-budget b/roles/fedora-budget/proxy/files/cron-sync-budget new file mode 100644 index 0000000..ab32729 --- /dev/null +++ b/roles/fedora-budget/proxy/files/cron-sync-budget @@ -0,0 +1 @@ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::budget.fedoraproject.org/ /srv/web/budget.fedoraproject.org/ diff --git a/roles/fedora-budget/proxy/files/languages.conf b/roles/fedora-budget/proxy/files/languages.conf new file mode 100644 index 0000000..d20049b --- /dev/null +++ b/roles/fedora-budget/proxy/files/languages.conf @@ -0,0 +1,144 @@ +# Define the correct MIME type for specific languages +AddType text/html .bn +AddType text/html .el +AddType text/html .nb +AddType text/html .pl +AddType text/html .tr +AddType text/html .es + +AddLanguage af .af +AddLanguage ar .ar +AddLanguage as .as +AddLanguage ast .ast +AddLanguage bal .bal +AddLanguage bg .bg +AddLanguage bn .bn +AddLanguage bn-in .bn_IN +AddLanguage br .br +AddLanguage ca .ca +AddLanguage cs .cs +AddLanguage da .da +AddLanguage de .de +AddLanguage de-ch .de_CH +AddLanguage el .el +AddLanguage en .en +AddLanguage en-gb .en_GB +AddLanguage es .es +AddLanguage eu .eu +AddLanguage fa .fa +AddLanguage fi .fi +AddLanguage fr .fr +AddLanguage gl .gl +AddLanguage gu .gu +AddLanguage he .he +AddLanguage hi .hi +AddLanguage hu .hu +AddLanguage ia .ia +AddLanguage id .id +AddLanguage is .is +AddLanguage it .it +AddLanguage ja .ja +AddLanguage ka .ka +AddLanguage kn .kn +AddLanguage ko .ko +AddLanguage lv .lv +AddLanguage ml .ml +AddLanguage mr .mr +AddLanguage nb .nb +AddLanguage nl .nl +AddLanguage or .or +AddLanguage pa .pa +AddLanguage pl .pl +AddLanguage pt .pt +AddLanguage pt-br .pt_BR +AddLanguage ro .ro +AddLanguage ru .ru +AddLanguage sk .sk +AddLanguage sq .sq +AddLanguage sr .sr +AddLanguage sv .sv +AddLanguage ta .ta +AddLanguage te .te +AddLanguage tg .tg +AddLanguage th .th +AddLanguage tr .tr +AddLanguage uk .uk +AddLanguage vi .vi +AddLanguage zh-cn .zh_CN +AddLanguage zh-tw .zh_TW + +LanguagePriority en +ForceLanguagePriority Prefer Fallback + +AddDefaultCharset utf-8 + +RewriteEngine on + +RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$ +RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301] +AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/budget.fedoraproject.org$1 + +<Directory /srv/web/budget.fedoraproject.org> + Options MultiViews + + SetEnvIf Request_URI ^/af/ prefer-language=af + SetEnvIf Request_URI ^/ar/ prefer-language=ar + SetEnvIf Request_URI ^/as/ prefer-language=as + SetEnvIf Request_URI ^/ast/ prefer-language=ast + SetEnvIf Request_URI ^/bal/ prefer-language=bal + SetEnvIf Request_URI ^/bg/ prefer-language=bg + SetEnvIf Request_URI ^/bn/ prefer-language=bn + SetEnvIf Request_URI ^/bn_IN/ prefer-language=bn-in + SetEnvIf Request_URI ^/br/ prefer-language=br + SetEnvIf Request_URI ^/ca/ prefer-language=ca + SetEnvIf Request_URI ^/cs/ prefer-language=cs + SetEnvIf Request_URI ^/da/ prefer-language=da + SetEnvIf Request_URI ^/de/ prefer-language=de + SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch + SetEnvIf Request_URI ^/el/ prefer-language=el + SetEnvIf Request_URI ^/en/ prefer-language=en + SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb + SetEnvIf Request_URI ^/es/ prefer-language=es + SetEnvIf Request_URI ^/eu/ prefer-language=eu + SetEnvIf Request_URI ^/fa/ prefer-language=fa + SetEnvIf Request_URI ^/fi/ prefer-language=fi + SetEnvIf Request_URI ^/fr/ prefer-language=fr + SetEnvIf Request_URI ^/gl/ prefer-language=gl + SetEnvIf Request_URI ^/gu/ prefer-language=gu + SetEnvIf Request_URI ^/he/ prefer-language=he + SetEnvIf Request_URI ^/hi/ prefer-language=hi + SetEnvIf Request_URI ^/hu/ prefer-language=hu + SetEnvIf Request_URI ^/ia/ prefer-language=ia + SetEnvIf Request_URI ^/id/ prefer-language=id + SetEnvIf Request_URI ^/is/ prefer-language=is + SetEnvIf Request_URI ^/it/ prefer-language=it + SetEnvIf Request_URI ^/ja/ prefer-language=ja + SetEnvIf Request_URI ^/ka/ prefer-language=ka + SetEnvIf Request_URI ^/kn/ prefer-language=kn + SetEnvIf Request_URI ^/ko/ prefer-language=ko + SetEnvIf Request_URI ^/lv/ prefer-language=lv + SetEnvIf Request_URI ^/ml/ prefer-language=ml + SetEnvIf Request_URI ^/mr/ prefer-language=mr + SetEnvIf Request_URI ^/nb/ prefer-language=nb + SetEnvIf Request_URI ^/nl/ prefer-language=nl + SetEnvIf Request_URI ^/or/ prefer-language=or + SetEnvIf Request_URI ^/pa/ prefer-language=pa + SetEnvIf Request_URI ^/pl/ prefer-language=pl + SetEnvIf Request_URI ^/pt/ prefer-language=pt + SetEnvIf Request_URI ^/pt_BR/ prefer-language=pt-br + SetEnvIf Request_URI ^/ro/ prefer-language=ro + SetEnvIf Request_URI ^/ru/ prefer-language=ru + SetEnvIf Request_URI ^/sk/ prefer-language=sk + SetEnvIf Request_URI ^/sq/ prefer-language=sq + SetEnvIf Request_URI ^/sr/ prefer-language=sr + SetEnvIf Request_URI ^/sv/ prefer-language=sv + SetEnvIf Request_URI ^/ta/ prefer-language=ta + SetEnvIf Request_URI ^/te/ prefer-language=te + SetEnvIf Request_URI ^/tg/ prefer-language=tg + SetEnvIf Request_URI ^/th/ prefer-language=th + SetEnvIf Request_URI ^/tr/ prefer-language=tr + SetEnvIf Request_URI ^/uk/ prefer-language=uk + SetEnvIf Request_URI ^/vi/ prefer-language=vi + SetEnvIf Request_URI ^/zh_CN/ prefer-language=zh-cn + SetEnvIf Request_URI ^/zh_TW/ prefer-language=zh-tw +</Directory> diff --git a/roles/fedora-budget/proxy/tasks/main.yml b/roles/fedora-budget/proxy/tasks/main.yml new file mode 100644 index 0000000..04eb0d8 --- /dev/null +++ b/roles/fedora-budget/proxy/tasks/main.yml @@ -0,0 +1,18 @@ +- name: Copy in the sync-budget cronjob + copy: src=cron-sync-budget dest=/etc/cron.d/sync-budget + tags: + - fedora-web + - fedora-web/budget + +- name: Copy some config files for {{website}} + copy: > + src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} + owner=root group=root mode=0644 + with_items: + - budget.conf + - languages.conf + notify: + - reload proxyhttpd + tags: + - fedora-web + - fedora-web/budget diff --git a/roles/fedora-web/budget/files/budget.conf b/roles/fedora-web/budget/files/budget.conf deleted file mode 100644 index 17c01d1..0000000 --- a/roles/fedora-web/budget/files/budget.conf +++ /dev/null @@ -1,9 +0,0 @@ -DocumentRoot /srv/web/budget.fedoraproject.org -Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico - -AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript - -FileETag MTime Size - -ExpiresActive On -ExpiresDefault "access plus 30 minutes" diff --git a/roles/fedora-web/budget/files/cron-sync-budget b/roles/fedora-web/budget/files/cron-sync-budget deleted file mode 100644 index ab32729..0000000 --- a/roles/fedora-web/budget/files/cron-sync-budget +++ /dev/null @@ -1 +0,0 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::budget.fedoraproject.org/ /srv/web/budget.fedoraproject.org/ diff --git a/roles/fedora-web/budget/files/languages.conf b/roles/fedora-web/budget/files/languages.conf deleted file mode 100644 index d20049b..0000000 --- a/roles/fedora-web/budget/files/languages.conf +++ /dev/null @@ -1,144 +0,0 @@ -# Define the correct MIME type for specific languages -AddType text/html .bn -AddType text/html .el -AddType text/html .nb -AddType text/html .pl -AddType text/html .tr -AddType text/html .es - -AddLanguage af .af -AddLanguage ar .ar -AddLanguage as .as -AddLanguage ast .ast -AddLanguage bal .bal -AddLanguage bg .bg -AddLanguage bn .bn -AddLanguage bn-in .bn_IN -AddLanguage br .br -AddLanguage ca .ca -AddLanguage cs .cs -AddLanguage da .da -AddLanguage de .de -AddLanguage de-ch .de_CH -AddLanguage el .el -AddLanguage en .en -AddLanguage en-gb .en_GB -AddLanguage es .es -AddLanguage eu .eu -AddLanguage fa .fa -AddLanguage fi .fi -AddLanguage fr .fr -AddLanguage gl .gl -AddLanguage gu .gu -AddLanguage he .he -AddLanguage hi .hi -AddLanguage hu .hu -AddLanguage ia .ia -AddLanguage id .id -AddLanguage is .is -AddLanguage it .it -AddLanguage ja .ja -AddLanguage ka .ka -AddLanguage kn .kn -AddLanguage ko .ko -AddLanguage lv .lv -AddLanguage ml .ml -AddLanguage mr .mr -AddLanguage nb .nb -AddLanguage nl .nl -AddLanguage or .or -AddLanguage pa .pa -AddLanguage pl .pl -AddLanguage pt .pt -AddLanguage pt-br .pt_BR -AddLanguage ro .ro -AddLanguage ru .ru -AddLanguage sk .sk -AddLanguage sq .sq -AddLanguage sr .sr -AddLanguage sv .sv -AddLanguage ta .ta -AddLanguage te .te -AddLanguage tg .tg -AddLanguage th .th -AddLanguage tr .tr -AddLanguage uk .uk -AddLanguage vi .vi -AddLanguage zh-cn .zh_CN -AddLanguage zh-tw .zh_TW - -LanguagePriority en -ForceLanguagePriority Prefer Fallback - -AddDefaultCharset utf-8 - -RewriteEngine on - -RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$ -RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301] -AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/budget.fedoraproject.org$1 - -<Directory /srv/web/budget.fedoraproject.org> - Options MultiViews - - SetEnvIf Request_URI ^/af/ prefer-language=af - SetEnvIf Request_URI ^/ar/ prefer-language=ar - SetEnvIf Request_URI ^/as/ prefer-language=as - SetEnvIf Request_URI ^/ast/ prefer-language=ast - SetEnvIf Request_URI ^/bal/ prefer-language=bal - SetEnvIf Request_URI ^/bg/ prefer-language=bg - SetEnvIf Request_URI ^/bn/ prefer-language=bn - SetEnvIf Request_URI ^/bn_IN/ prefer-language=bn-in - SetEnvIf Request_URI ^/br/ prefer-language=br - SetEnvIf Request_URI ^/ca/ prefer-language=ca - SetEnvIf Request_URI ^/cs/ prefer-language=cs - SetEnvIf Request_URI ^/da/ prefer-language=da - SetEnvIf Request_URI ^/de/ prefer-language=de - SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch - SetEnvIf Request_URI ^/el/ prefer-language=el - SetEnvIf Request_URI ^/en/ prefer-language=en - SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb - SetEnvIf Request_URI ^/es/ prefer-language=es - SetEnvIf Request_URI ^/eu/ prefer-language=eu - SetEnvIf Request_URI ^/fa/ prefer-language=fa - SetEnvIf Request_URI ^/fi/ prefer-language=fi - SetEnvIf Request_URI ^/fr/ prefer-language=fr - SetEnvIf Request_URI ^/gl/ prefer-language=gl - SetEnvIf Request_URI ^/gu/ prefer-language=gu - SetEnvIf Request_URI ^/he/ prefer-language=he - SetEnvIf Request_URI ^/hi/ prefer-language=hi - SetEnvIf Request_URI ^/hu/ prefer-language=hu - SetEnvIf Request_URI ^/ia/ prefer-language=ia - SetEnvIf Request_URI ^/id/ prefer-language=id - SetEnvIf Request_URI ^/is/ prefer-language=is - SetEnvIf Request_URI ^/it/ prefer-language=it - SetEnvIf Request_URI ^/ja/ prefer-language=ja - SetEnvIf Request_URI ^/ka/ prefer-language=ka - SetEnvIf Request_URI ^/kn/ prefer-language=kn - SetEnvIf Request_URI ^/ko/ prefer-language=ko - SetEnvIf Request_URI ^/lv/ prefer-language=lv - SetEnvIf Request_URI ^/ml/ prefer-language=ml - SetEnvIf Request_URI ^/mr/ prefer-language=mr - SetEnvIf Request_URI ^/nb/ prefer-language=nb - SetEnvIf Request_URI ^/nl/ prefer-language=nl - SetEnvIf Request_URI ^/or/ prefer-language=or - SetEnvIf Request_URI ^/pa/ prefer-language=pa - SetEnvIf Request_URI ^/pl/ prefer-language=pl - SetEnvIf Request_URI ^/pt/ prefer-language=pt - SetEnvIf Request_URI ^/pt_BR/ prefer-language=pt-br - SetEnvIf Request_URI ^/ro/ prefer-language=ro - SetEnvIf Request_URI ^/ru/ prefer-language=ru - SetEnvIf Request_URI ^/sk/ prefer-language=sk - SetEnvIf Request_URI ^/sq/ prefer-language=sq - SetEnvIf Request_URI ^/sr/ prefer-language=sr - SetEnvIf Request_URI ^/sv/ prefer-language=sv - SetEnvIf Request_URI ^/ta/ prefer-language=ta - SetEnvIf Request_URI ^/te/ prefer-language=te - SetEnvIf Request_URI ^/tg/ prefer-language=tg - SetEnvIf Request_URI ^/th/ prefer-language=th - SetEnvIf Request_URI ^/tr/ prefer-language=tr - SetEnvIf Request_URI ^/uk/ prefer-language=uk - SetEnvIf Request_URI ^/vi/ prefer-language=vi - SetEnvIf Request_URI ^/zh_CN/ prefer-language=zh-cn - SetEnvIf Request_URI ^/zh_TW/ prefer-language=zh-tw -</Directory> diff --git a/roles/fedora-web/budget/tasks/main.yml b/roles/fedora-web/budget/tasks/main.yml deleted file mode 100644 index 04eb0d8..0000000 --- a/roles/fedora-web/budget/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ -- name: Copy in the sync-budget cronjob - copy: src=cron-sync-budget dest=/etc/cron.d/sync-budget - tags: - - fedora-web - - fedora-web/budget - -- name: Copy some config files for {{website}} - copy: > - src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} - owner=root group=root mode=0644 - with_items: - - budget.conf - - languages.conf - notify: - - reload proxyhttpd - tags: - - fedora-web - - fedora-web/budget diff --git a/roles/fedora-web/build/files/syncStatic.sh b/roles/fedora-web/build/files/syncStatic.sh index c3bae6a..8c5d622 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 80b3f0f..ce6411a 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 d8467e3..ed33008 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 d8467e3..ed33008 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"
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
