diff --git a/playbooks/manual/rebuild/websites.yml b/playbooks/manual/rebuild/websites.yml index d1400ab7f4..a564fdbc5a 100644 --- a/playbooks/manual/rebuild/websites.yml +++ b/playbooks/manual/rebuild/websites.yml @@ -3,7 +3,7 @@ user: root become: true become_user: apache - vars_files: + vars_files: - /srv/web/infra/ansible/vars/global.yml - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml @@ -15,7 +15,7 @@ - name: Tell the proxies to sync that freshness hosts: proxies:proxies_stg user: root - vars_files: + vars_files: - /srv/web/infra/ansible/vars/global.yml - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml @@ -25,7 +25,6 @@ command: /usr/bin/rsync --delete -a --no-owner --no-group sundries01::{{item}}/ /srv/web/{{item}}/ with_items: - getfedora.org - - arm.fedoraproject.org - fedoracommunity.org - developer.fedoraproject.org - fedoraproject.org diff --git a/roles/fedora-web/arm/files/arm.conf b/roles/fedora-web/arm/files/arm.conf deleted file mode 100644 index 1401924b3f..0000000000 --- a/roles/fedora-web/arm/files/arm.conf +++ /dev/null @@ -1,9 +0,0 @@ -DocumentRoot /srv/web/arm.fedoraproject.org -Alias /favicon.ico /srv/web/fedoraproject.org/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/arm/files/cron-sync-arm b/roles/fedora-web/arm/files/cron-sync-arm deleted file mode 100644 index b8b7681e69..0000000000 --- a/roles/fedora-web/arm/files/cron-sync-arm +++ /dev/null @@ -1 +0,0 @@ -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/arm/files/languages.conf b/roles/fedora-web/arm/files/languages.conf deleted file mode 100644 index cc949c2754..0000000000 --- a/roles/fedora-web/arm/files/languages.conf +++ /dev/null @@ -1,81 +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 .es -AddType text/html .tr -AddType text/html .sr -AddType text/html .si -AddType text/html .pt - -AddLanguage ar .ar -AddLanguage bn-in .bn_IN -AddLanguage ca .ca -AddLanguage cs .cs -AddLanguage da .da -AddLanguage de .de -AddLanguage en .en -AddLanguage es .es -AddLanguage fi .fi -AddLanguage fr .fr -AddLanguage hu .hu -AddLanguage id .id -AddLanguage it .it -AddLanguage ja .ja -AddLanguage km .km -AddLanguage ko .ko -AddLanguage pl .pl -AddLanguage pt .pt -AddLanguage pt-br .pt_BR -AddLanguage ru .ru -AddLanguage si .si -AddLanguage sk .sk -AddLanguage sr .sr -AddLanguage sv .sv -AddLanguage tr .tr -AddLanguage uk .uk -AddLanguage zh-cn .zh_Hans_CN - -LanguagePriority en -ForceLanguagePriority Prefer Fallback - -AddDefaultCharset utf-8 - -RewriteEngine on - -RewriteCond %{QUERY_STRING} ^lang=(ar|bn_IN|ca|cs|da|de|en|es|fi|fr|hu|id|it|ja|km|ko|pl|pt|pt_BR|ru|si|sk|sr|sv|tr|uk|zh_Hans_CN)$ -RewriteRule ^(?:/(?:ar|bn_IN|ca|cs|da|de|en|es|fi|fr|hu|id|it|ja|km|ko|pl|pt|pt_BR|ru|si|sk|sr|sv|tr|uk|zh_Hans_CN))?(/.*)$ /%1$1? [R=301] -AliasMatch ^(?:/(?:ar|bn_IN|ca|cs|da|de|en|es|fi|fr|hu|id|it|ja|km|ko|pl|pt|pt_BR|ru|si|sk|sr|sv|tr|uk|zh_Hans_CN))(/.*)?$ /srv/web/arm.fedoraproject.org$1 - - - Options MultiViews - - SetEnvIf Request_URI ^/ar/ prefer-language=ar - SetEnvIf Request_URI ^/bn_IN/ prefer-language=bn-in - 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 ^/en/ prefer-language=en - SetEnvIf Request_URI ^/es/ prefer-language=es - SetEnvIf Request_URI ^/fi/ prefer-language=fi - SetEnvIf Request_URI ^/fr/ prefer-language=fr - SetEnvIf Request_URI ^/hu/ prefer-language=hu - SetEnvIf Request_URI ^/id/ prefer-language=id - SetEnvIf Request_URI ^/it/ prefer-language=it - SetEnvIf Request_URI ^/ja/ prefer-language=ja - SetEnvIf Request_URI ^/km/ prefer-language=km - SetEnvIf Request_URI ^/ko/ prefer-language=ko - 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 ^/ru/ prefer-language=ru - SetEnvIf Request_URI ^/si/ prefer-language=si - SetEnvIf Request_URI ^/sk/ prefer-language=sk - SetEnvIf Request_URI ^/sr/ prefer-language=sr - SetEnvIf Request_URI ^/sv/ prefer-language=sv - SetEnvIf Request_URI ^/tr/ prefer-language=tr - SetEnvIf Request_URI ^/uk/ prefer-language=uk - SetEnvIf Request_URI ^/zh_Hans_CN/ prefer-language=zh-cn - diff --git a/roles/fedora-web/arm/tasks/main.yml b/roles/fedora-web/arm/tasks/main.yml deleted file mode 100644 index 1405904e52..0000000000 --- a/roles/fedora-web/arm/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ -- name: Copy in the sync-arm cronjob - copy: src=cron-sync-arm dest=/etc/cron.d/sync-arm - tags: - - fedora-web - - fedora-web/arm - -- 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: - - arm.conf - - languages.conf - notify: - - reload proxyhttpd - tags: - - fedora-web - - fedora-web/arm diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index 083c44f95d..09a1b0aebd 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -126,14 +126,6 @@ gid = root read only = yes hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 -[arm.fedoraproject.org] -comment = arm.fedoraproject.org -path = /srv/websites/arm.fedoraproject.org -uid = root -gid = root -read only = yes -hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 - [iot.fedoraproject.org] comment = iot.fedoraproject.org path = /srv/web/iot.fedoraproject.org diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg index fd85418121..dac5a8e4e4 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -126,14 +126,6 @@ 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 10.3.160.0/255.255.224.0 -[arm.fedoraproject.org] -comment = arm.fedoraproject.org -path = /srv/web/arm.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 10.3.160.0/255.255.224.0 - [iot.fedoraproject.org] comment = iot.fedoraproject.org path = /srv/web/iot.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 d165b3dd45..0ef73dcf32 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 translate.fedoraproject.org uk.fedoracommunity.org fedoraloveskde.org kinoite.fedoraproject.org" +SITES="admin.fedoraproject.org apps.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 translate.fedoraproject.org uk.fedoracommunity.org fedoraloveskde.org kinoite.fedoraproject.org" pushd ${CONFDIR} for SITE in ${SITES}; do