diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index b035d44cdd..62eec33f8b 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -15,8 +15,6 @@ - role: fedora-web/main website: fedoraproject.org - - role: fedora-web/spins - website: spins.fedoraproject.org - role: fedora-web/start website: start.fedoraproject.org - role: fedora-web/mirrors diff --git a/playbooks/manual/rebuild/websites.yml b/playbooks/manual/rebuild/websites.yml index a564fdbc5a..18beb70155 100644 --- a/playbooks/manual/rebuild/websites.yml +++ b/playbooks/manual/rebuild/websites.yml @@ -30,6 +30,5 @@ - fedoraproject.org - labs.fedoraproject.org - mirrors.fedoraproject.org - - spins.fedoraproject.org - start.fedoraproject.org - budget.fedoraproject.org diff --git a/roles/fedora-web/spins/files/cron-sync-spins b/roles/fedora-web/spins/files/cron-sync-spins deleted file mode 100644 index b221894c44..0000000000 --- a/roles/fedora-web/spins/files/cron-sync-spins +++ /dev/null @@ -1 +0,0 @@ -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/spins/files/languages.conf b/roles/fedora-web/spins/files/languages.conf deleted file mode 100644 index 284a70a830..0000000000 --- a/roles/fedora-web/spins/files/languages.conf +++ /dev/null @@ -1,141 +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 af .af -AddLanguage ar .ar -AddLanguage as .as -AddLanguage ast .ast -AddLanguage az .az -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 el .el -AddLanguage en .en -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 km .km -AddLanguage ko .ko -AddLanguage lv .lv -AddLanguage ml .ml -AddLanguage mr .mr -AddLanguage nb .nb -AddLanguage nl .nl -AddLanguage pa .pa -AddLanguage pl .pl -AddLanguage pt .pt -AddLanguage pt-br .pt_BR -AddLanguage ro .ro -AddLanguage ru .ru -AddLanguage si .si -AddLanguage sk .sk -AddLanguage sq .sq -AddLanguage sr .sr -AddLanguage sv .sv -AddLanguage ta .ta -AddLanguage te .te -AddLanguage tg .tg -AddLanguage tr .tr -AddLanguage uk .uk -AddLanguage vi .vi -AddLanguage zh-cn .zh_Hans_CN -AddLanguage zh-tw .zh_Hant_TW - -LanguagePriority en -ForceLanguagePriority Prefer Fallback - -AddDefaultCharset utf-8 - -RewriteEngine on - -RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|az|bg|bn|bn_IN|br|ca|cs|da|de|el|en|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|ko|lv|ml|mr|nb|nl|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|tr|uk|vi|zh_Hans_CN|zh_Hant_TW)$ -RewriteRule ^(?:/(?:af|ar|as|ast|az|bg|bn|bn_IN|br|ca|cs|da|de|el|en|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|ko|lv|ml|mr|nb|nl|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|tr|uk|vi|zh_Hans_CN|zh_Hant_TW))?(/.*)$ /%1$1? [R=301] -AliasMatch ^(?:/(?:af|ar|as|ast|az|bg|bn|bn_IN|br|ca|cs|da|de|el|en|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|ko|lv|ml|mr|nb|nl|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|tr|uk|vi|zh_Hans_CN|zh_Hant_TW))(/.*)?$ /srv/web/spins.fedoraproject.org$1 - - - 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 ^/az/ prefer-language=az - 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 ^/el/ prefer-language=el - SetEnvIf Request_URI ^/en/ prefer-language=en - 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 ^/km/ prefer-language=km - 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 ^/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 ^/si/ prefer-language=si - 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 ^/tr/ prefer-language=tr - SetEnvIf Request_URI ^/uk/ prefer-language=uk - SetEnvIf Request_URI ^/vi/ prefer-language=vi - SetEnvIf Request_URI ^/zh_Hans_CN/ prefer-language=zh-cn - SetEnvIf Request_URI ^/zh_Hant_TW/ prefer-language=zh-tw - diff --git a/roles/fedora-web/spins/files/spins.conf b/roles/fedora-web/spins/files/spins.conf deleted file mode 100644 index e3b596c8af..0000000000 --- a/roles/fedora-web/spins/files/spins.conf +++ /dev/null @@ -1,15 +0,0 @@ -DocumentRoot /srv/web/spins.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 - -Redirect /design-suite http://spins.fedoraproject.org/design -Redirect /electronic-lab http://spins.fedoraproject.org/fel - -RedirectMatch /(.*)/design-suite/ http://spins.fedoraproject.org/$1/design -RedirectMatch /(.*)/electronic-lab/ http://spins.fedoraproject.org/$1/fel - -ExpiresActive On -ExpiresDefault "access plus 30 minutes" diff --git a/roles/fedora-web/spins/tasks/main.yml b/roles/fedora-web/spins/tasks/main.yml deleted file mode 100644 index 288617f223..0000000000 --- a/roles/fedora-web/spins/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ -- name: Copy in the sync-spins cronjob - copy: src=cron-sync-spins dest=/etc/cron.d/sync-spins - tags: - - fedora-web - - fedora-web/spins - -- name: Make directory for the config files for {{website}} we are about to copy - file: path=/etc/httpd/conf.d/{{website}} state=directory owner=root group=root mode=0755 - tags: - - fedora-web - - fedora-web/spins - -- 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: - - spins.conf - - languages.conf - notify: - - reload proxyhttpd - tags: - - fedora-web - - fedora-web/spins diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index a20506d7be..bb7feedb99 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -54,14 +54,6 @@ gid = root read only = yes hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 -[spins.fedoraproject.org] -comment = spins.fedoraproject.org -path = /srv/websites/spins.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 - [talk.fedoraproject.org] comment = talk.fedoraproject.org path = /srv/web/talk.fedoraproject.org diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg index 52b5cda3f5..dcc2d5c9fb 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -54,14 +54,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 -[spins.fedoraproject.org] -comment = spins.fedoraproject.org -path = /srv/web/spins.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 - [talk.fedoraproject.org] comment = talk.fedoraproject.org path = /srv/web/talk.fedoraproject.org