September 2017 - infrastructure - Fedora Mailing-Lists

[FBR] Update the fedfind package in fedimg box

by Sayan Chowdhury

Hi all, fedimg box has been throwing the error for some days now: File "/usr/lib/python2.7/site-packages/fedimg/consumers.py", line 71 in consume cmetadata = fedfind.release.get_release_cid(compose_id).metadata File "/usr/lib/python2.7/site-packages/fedfind/release.py", line 869 in metadata logger.error("Pungi4Release: failed to download metadata!") I would like to update the fedfind package in fedimg box. +1s? -- Sayan Chowdhury <https://sayanchowdhury.dgplug.org/> Senior Software Engineer, Fedora Engineering - Emerging Platform GPG Fingerprint : 0F16 E841 E517 225C 7D13 AB3C B023 9931 9CD0 5C8B Proud to work at The Open Organization!

6 years, 7 months

3
6
0 / 0

Freeze break request: budget site

by Kevin Fenzi

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"

6 years, 7 months

3
2
0 / 0

[FBR] Move download-ib01 to new server

by Stephen John Smoogen

diff --git a/files/download/sync-up-downloads.sh.ib01 b/files/download/sync-up-downloads.sh.ib01 index 98624c7..dde40cf 100755 --- a/files/download/sync-up-downloads.sh.ib01 +++ b/files/download/sync-up-downloads.sh.ib01 @@ -14,9 +14,13 @@ FED_EXCLUDES="" DATE_EPEL='/root/last-epel-sync' DATE_FED='/root/last-fed-sync' +DATE_ARCHIVE='/root/last-archive-sync' +DATE_ALT='/root/last-alt-sync' +DATE_SECOND='/root/last-second-sync' -touch ${DATE_EPEL} -touch ${DATE_FED} +for i in ${DATE_EPEL} ${DATE_FED} ${DATE_ARCHIVE} ${DATE_ALT} ${DATE_SECOND}; do + touch ${i} +done LAST_SYNC='/usr/local/bin/last-sync' @@ -54,6 +58,9 @@ function sync_stuff() { sync_stuff ${DATE_EPEL} rsync_epel fedora-epel0 /srv/pub/epel/ "-e" sync_stuff ${DATE_FED} rsync_fedora fedora-enchilada0 /srv/pub/fedora/ "-f" +sync_stuff ${DATE_ARCHIVE} rsync_archive fedora-archive0 /srv/pub/archive/ "-f" +sync_stuff ${DATE_ALT} rsync_alt fedora-alt0 /srv/pub/alt/ "-f" +sync_stuff ${DATE_SECOND} rsync_second fedora-secondary0 /srv/pub/fedora-secondary/ "-f" # Let MM know I'm all up to date #/usr/bin/report_mirror diff --git a/inventory/host_vars/download-ib01.fedoraproject.org b/inventory/host_vars/download-ib01.fedoraproject.org index ed0559d..d556cd5 100644 --- a/inventory/host_vars/download-ib01.fedoraproject.org +++ b/inventory/host_vars/download-ib01.fedoraproject.org @@ -6,7 +6,7 @@ dns: 8.8.8.8 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ -vmhost: ibiblio03.fedoraproject.org +vmhost: ibiblio01.fedoraproject.org volgroup: /dev/vg_guests eth0_ip: 152.19.134.145 diff --git a/inventory/inventory b/inventory/inventory index 5920200..3021edf 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -360,7 +360,6 @@ download05.phx2.fedoraproject.org [download-ibiblio] download-ib01.fedoraproject.org -download-ib02.fedoraproject.org [download-rdu2] download-rdu01.fedoraproject.org diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index c488b9e..9a7b0fc 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -141,6 +141,13 @@ refuse options = checksum gid = 263 hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} +[fedora-secondary0] + comment = Fedora Secondary Archs + path = /srv/pub/fedora-secondary + list = no + uid = nobody + gid = 263 + hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} [fedora-compose0] comment = Fedora composes -- Stephen J Smoogen.

6 years, 7 months

1
0
0 / 0

FBR: Fix krb5

by Patrick Uiterwijk

Hi all, After a lot of debugging, it seems IPA 4.5.0 broke active/active failover for krb5. While I wait on getting that fixed, I would like to request +1s for the following patch. commit 4005fd5929c034436e21c56af0322d53cef04e74 Author: Patrick Uiterwijk <puiterwijk(a)redhat.com> Date: Fri Sep 15 22:50:02 2017 +0000 Fix krb5 with failover Seems like IPA 4.5.0 broke active/active failover of krb5 KDC. While we wait on getting that fixed, let's set us up for active/passive failover on the HTTPD end. Since we can't do active/passive for UDP (there's no checks there), let's just remove ipa02 for those. Signed-off-by: Patrick Uiterwijk <puiterwijk(a)redhat.com> diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index be1e5b5..cda10ab 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -340,7 +340,7 @@ listen ipa 0.0.0.0:10053 balance hdr(appserver) server ipa01 ipa01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem {% if env != "staging" %} - server ipa02 ipa02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem + server ipa02 ipa02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem backup {% endif %} option httpchk GET /ipa/ui/ @@ -354,7 +354,7 @@ listen krb5 0.0.0.0:1088 timeout connect 86400000 server ipa01 ipa01:88 weight 1 maxconn 16384 {% if env == "production" %} - server ipa02 ipa02:88 weight 1 maxconn 16384 + # server ipa02 ipa02:88 weight 1 maxconn 16384 {% endif %} listen docker-candidate-registry 0.0.0.0:10054

6 years, 7 months

3
3
0 / 0

Any idea what happened to the Fedora 27 ostree refs yesterday?

by Dusty Mabe

https://pagure.io/atomic-wg/issue/336 Each ref only has one commit in it now: ``` Fri Sep 15 11:43:42 UTC 2017 Testing 27 fedora/27/x86_64/atomic-host at https://kojipkgs.fedoraproject.org/compose/atomic/27/ 1 metadata, 0 content objects fetched; 569 B transferred in 1 seconds checking 2017-09-01 '27.20170901.n.1' fb38704... GOOD! error: Commit fb3870488a644e179ba2ac587ee693ce4203e703e3e39c67257f479a1e28bf1c has no parent Fri Sep 15 11:43:44 UTC 2017 Testing 27 fedora/27/ppc64le/atomic-host at https://kojipkgs.fedoraproject.org/compose/atomic/27/ 1 metadata, 0 content objects fetched; 569 B transferred in 1 seconds checking 2017-09-03 '27.20170903.n.0' 4436083... GOOD! error: Commit 44360832d299b2cf6ca33f4199b3e47613aa22de14784c37ec9b2e4478e1429e has no parent Fri Sep 15 11:43:46 UTC 2017 Testing 27 fedora/27/aarch64/atomic-host at https://kojipkgs.fedoraproject.org/compose/atomic/27/ 1 metadata, 0 content objects fetched; 569 B transferred in 1 seconds checking 2017-09-02 '27.20170902.n.0' fc7a9e5... GOOD! error: Commit fc7a9e5378ba2c8f2b22f746dc8f56f0588eb637f8a3a5439e25cfd5d9f16371 has no parent Fri Sep 15 11:43:48 UTC 2017 Testing 27 fedora/27/x86_64/workstation at https://kojipkgs.fedoraproject.org/compose/ostree/27/ 1 metadata, 0 content objects fetched; 569 B transferred in 1 seconds checking 2017-09-12 '27.20170911.n.1' 80d7094... GOOD! error: Commit 80d709452bf8a24e722e8af5e81f9046c991200384d1bd44a7415c1fbf1e5b06 has no parent ``` You can see this at http://ostree-signed-commit-checker-fooplay.origin.dustymabe.com/ Kevin did sign commits for me yesterday but I don't think that should have caused us to lose history. This is not a huge deal since f27 is not released, but I would like to find out why we lost history so it doesn't happen again. Dusty

6 years, 7 months

2
1
0 / 0

FBR: Run nagios playbook to fix disable swap check on os-*-stg

by Ricky Elrod

Already committed, but I'd like to actually run the playbook to put it in place: Only affects stg checks, but nagios itself is prod, so looking for +1s. From d20271d809046ca49ddd1a1646ab9072a40bd025 Mon Sep 17 00:00:00 2001 From: Ricky Elrod <codeblock(a)fedoraproject.org> Date: Fri, 15 Sep 2017 21:19:14 +0000 Subject: stop checking swap here Signed-off-by: Ricky Elrod <codeblock(a)fedoraproject.org> --- inventory/group_vars/os-control-stg | 3 +++ inventory/group_vars/os-nodes-stg | 2 ++ 2 files changed, 5 insertions(+) diff --git a/inventory/group_vars/os-control-stg b/inventory/group_vars/os-control-stg index 63a4f23..0b50f8c 100644 --- a/inventory/group_vars/os-control-stg +++ b/inventory/group_vars/os-control-stg @@ -2,3 +2,6 @@ os_url: os.stg.fedoraproject.org os_app_url: app.os.stg.fedoraproject.org + +nagios_Check_Services: + swap: false diff --git a/inventory/group_vars/os-nodes-stg b/inventory/group_vars/os-nodes-stg index 63a4f23..c2d0420 100644 --- a/inventory/group_vars/os-nodes-stg +++ b/inventory/group_vars/os-nodes-stg @@ -2,3 +2,5 @@ os_url: os.stg.fedoraproject.org os_app_url: app.os.stg.fedoraproject.org +nagios_Check_Services: + swap: false --

6 years, 7 months

3
3
0 / 0

FBR: MBS upgrade

by Ralph Bean

Hi, I'd like to upgrade the MBS to: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2017-1db0646bc6 In particular, the bit about "Wait for components to be tagged also in final tag before marking module as done. This should fix an issue for the F27 compose." is important. See https://pagure.io/fm-orchestrator/pull-request/686 There is a db upgrade (to the MBS db) in this update. I'll verify in staging first that I can upgrade/downgrade before touching prod. Anyone for a +1? -Ralph

6 years, 7 months

3
5
0 / 0

Restructuring hooks in dist-git

by Pierre-Yves Chibon

Good Morning Everyone, Looking into fixing the current git hook situation on dist-git I came accross the following architecture and I would like to discuss it with you. Each repo contains: - post-receive pointing to /usr/share/git-core/post-receive-chained - a folder post-receive-chained.d containing: - post-receive-alternativearch -> /usr/share/git-core/post-receive-alternativearch - post-receive-email -> /usr/share/git-core/mail-hooks/gnome-post-receive-email - post-receive-fedmsg -> /usr/share/git-core/post-receive-fedmsg And /usr/share/git-core/post-receive-chained contains: pee \ $GIT_DIR/hooks/post-receive-chained.d/post-receive-fedmsg \ $GIT_DIR/hooks/post-receive-chained.d/post-receive-alternativearch So each git repo contains symlinks to the different git hooks, but there is no need for them. I would propose the following changes: - Drop post-receive-chained.d entirely from each and every dist-git repo - Replace /usr/share/git-core/post-receive-chained to be: pee \ /usr/share/git-core/post-receive-fedmsg \ /usr/share/git-core/post-receive-alternativearch Adjust the script in ansible in roles/git/checks/files/check-perms.py to implement these changes. Bonus, adding/removing hooks would then just become a matter of updating roles/git/hooks/files/post-receive-chained in ansible. So we could just add the pagure hooks: /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py to it to solve both the lack of logging of commits activity and to add support for Merges/Fixes/Relates keywords in commit messages. Finally it looks like the check-perms.py script isn't being run, that may be my fault (I might have remove the script/cron when cleaning up after deploying pagure). What do you think? I know we are in freeze but this shouldn't impact directly anything release-related. Worth trying now or should it wait some more? Thanks, Pierre

6 years, 7 months

3
12
0 / 0

Plans for Thursday 2017-09-14 Fedora Infrastructure Meeting

by Stephen John Smoogen

Thursday 2017-09-14 the Fedora Infrastructure team will have a meeting in #fedora-meeting at 18:00 UTC. The agenda currently looks as follows on the gobby page. Please add or update as needed. = Introduction = We will use it over the week before the meeting to gather status and info and discussion items and so forth, then use it in the irc meeting to transfer information to the meetbot logs. = Meeting start stuff = #startmeeting Infrastructure (2017-09-14) #meetingname infrastructure #topic aloha #chair smooge relrod nirik abadger1999 dgilmore threebean pingou puiterwijk pbrobinson = Let new people say hello = #topic New folks introductions #info This is a place where people who are interested in Fedora Infrastructure can introduce themselves = Status / Information / Trivia / Announcements = (We put things here we want others on the team to know, but don't need to discuss) (Please use #info <the thing> - your name) #topic announcements and information #info PHX2 Colo Trip, Dec 4th - 9th #info Infrastructure will be down during that trip. #info beta freeze still going on. #info Moving .stg. ips ongoing #info high NFS4.1 traffic solved - kevin #info Moving i2 download server ongoing. = Things we should discuss = We use this section to bring up discussion topics. Things we want to talk about as a group and come up with some consensus /suor decision or just brainstorm a problem or issue. If there are none of these we skip this section. (Use #topic your discussion topic - your username) #topic Sleep and why you should get lots #topic = Apprentice office hours = #topic Apprentice Open office hours Here we will discuss any apprentice questions, try and match up people looking for things to do with things to do, progress, testing anything like that. = Learn about some application or setup in infrastructure = (This section, each week we get 1 person to talk about an application or setup that we have. Just going over what it is, how to contribute, ideas for improvement, etc. Whoever would like to do this, just add the i/nfo in this section. In the event we don't find someone to teach about something, we skip this section and just move on to open floor.) #topic Learn about: Nothing was put here yet this week = Meeting end stuff = #topic Open Floor #endmeeting -- Stephen J Smoogen.

6 years, 7 months

1
0
0 / 0

FBR to remove ibiblio02 from inventory

by Stephen John Smoogen

Also to run the nagios playbook to update noc01/noc02 diff --git a/inventory/hardware b/inventory/hardware index 9c3beed..da3a3a9 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -70,7 +70,6 @@ bvirthost11.phx2.fedoraproject.org [ibms] virthost12.phx2.fedoraproject.org -ibiblio02.fedoraproject.org ibiblio03.fedoraproject.org osuosl01.fedoraproject.org osuosl02.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 5d3b6c8..bd64ddb 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -152,7 +152,6 @@ bvirthost11.phx2.fedoraproject.org coloamer01.fedoraproject.org dedicatedsolutions01.fedoraproject.org ibiblio01.fedoraproject.org -ibiblio02.fedoraproject.org ibiblio03.fedoraproject.org ibiblio04.fedoraproject.org ibiblio05.fedoraproject.org -- Stephen J Smoogen.

6 years, 7 months

3
2
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

infrastructure September 2017