From e1b408851a50b773e55ab2361ed1cd07e652fdd5 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Thu, 14 Jan 2021 15:59:08 +0100 Subject: [PATCH] Remove build of fudcon The source code was removed in https://pagure.io/fedora-websites/c/f5646276cf629ffa32b87cb23afb99823d498510?branch=master and the website is just a redirect. --- playbooks/include/proxies-fedora-web.yml | 2 - playbooks/manual/rebuild/websites.yml | 1 - roles/fedora-web/build/files/syncStatic.sh | 1 - .../fedora-web/build/files/syncStatic.stg.sh | 1 - roles/fedora-web/build/tasks/main.yml | 1 - .../fedora-web/fudcon/files/cron-sync-fudcon | 1 - roles/fedora-web/fudcon/files/fudcon.conf | 12 -- roles/fedora-web/fudcon/files/languages.conf | 144 ------------------ roles/fedora-web/fudcon/tasks/main.yml | 18 --- roles/rsyncd/files/rsyncd.conf.sundries | 8 - roles/rsyncd/files/rsyncd.conf.sundries-stg | 8 - 11 files changed, 197 deletions(-) delete mode 100644 roles/fedora-web/fudcon/files/cron-sync-fudcon delete mode 100644 roles/fedora-web/fudcon/files/fudcon.conf delete mode 100644 roles/fedora-web/fudcon/files/languages.conf delete mode 100644 roles/fedora-web/fudcon/tasks/main.yml diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index cb1fa812b3..e6e942cb0e 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -25,8 +25,6 @@ website: communityblog.fedoraproject.org - role: fedora-web/community website: fedoracommunity.org - - role: fedora-web/fudcon - website: fudcon.fedoraproject.org - role: fedora-web/getfedora website: getfedora.org - role: fedora-web/flocktofedora diff --git a/playbooks/manual/rebuild/websites.yml b/playbooks/manual/rebuild/websites.yml index f0969fa482..d1400ab7f4 100644 --- a/playbooks/manual/rebuild/websites.yml +++ b/playbooks/manual/rebuild/websites.yml @@ -29,7 +29,6 @@ - fedoracommunity.org - developer.fedoraproject.org - fedoraproject.org - - fudcon.fedoraproject.org - labs.fedoraproject.org - mirrors.fedoraproject.org - spins.fedoraproject.org diff --git a/roles/fedora-web/build/files/syncStatic.sh b/roles/fedora-web/build/files/syncStatic.sh index 8dd565c083..704b221b4c 100644 --- a/roles/fedora-web/build/files/syncStatic.sh +++ b/roles/fedora-web/build/files/syncStatic.sh @@ -66,7 +66,6 @@ popd > /dev/null build flocktofedora.org build spins.fedoraproject.org build fedoracommunity.org -build fudcon.fedoraproject.org build start.fedoraproject.org build fedoraproject.org build iot.fedoraproject.org diff --git a/roles/fedora-web/build/files/syncStatic.stg.sh b/roles/fedora-web/build/files/syncStatic.stg.sh index 8ca27ecef5..b732e46c6b 100644 --- a/roles/fedora-web/build/files/syncStatic.stg.sh +++ b/roles/fedora-web/build/files/syncStatic.stg.sh @@ -66,7 +66,6 @@ popd > /dev/null build flocktofedora.org build fedoracommunity.org -build fudcon.fedoraproject.org build start.fedoraproject.org build fedoraproject.org build iot.fedoraproject.org diff --git a/roles/fedora-web/build/tasks/main.yml b/roles/fedora-web/build/tasks/main.yml index 75f01a0fe6..8184f9815a 100644 --- a/roles/fedora-web/build/tasks/main.yml +++ b/roles/fedora-web/build/tasks/main.yml @@ -40,7 +40,6 @@ - start.fedoraproject.org - mirrors.fedoraproject.org - fedoracommunity.org - - fudcon.fedoraproject.org - flocktofedora.org - arm.fedoraproject.org - iot.fedoraproject.org diff --git a/roles/fedora-web/fudcon/files/cron-sync-fudcon b/roles/fedora-web/fudcon/files/cron-sync-fudcon deleted file mode 100644 index d687efa8ec..0000000000 --- a/roles/fedora-web/fudcon/files/cron-sync-fudcon +++ /dev/null @@ -1 +0,0 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::fudcon.fedoraproject.org/ /srv/web/fudcon.fedoraproject.org/ diff --git a/roles/fedora-web/fudcon/files/fudcon.conf b/roles/fedora-web/fudcon/files/fudcon.conf deleted file mode 100644 index 1266a905c1..0000000000 --- a/roles/fedora-web/fudcon/files/fudcon.conf +++ /dev/null @@ -1,12 +0,0 @@ -DocumentRoot /srv/web/fudcon.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 - -Redirect /design-suite http://fudcon.fedoraproject.org/design -Redirect /electronic-lab http://fudcon.fedoraproject.org/fel - -ExpiresActive On -ExpiresDefault "access plus 30 minutes" diff --git a/roles/fedora-web/fudcon/files/languages.conf b/roles/fedora-web/fudcon/files/languages.conf deleted file mode 100644 index c5635ab01f..0000000000 --- a/roles/fedora-web/fudcon/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/fudcon.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 ^/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 - diff --git a/roles/fedora-web/fudcon/tasks/main.yml b/roles/fedora-web/fudcon/tasks/main.yml deleted file mode 100644 index 0985cb0e61..0000000000 --- a/roles/fedora-web/fudcon/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ -- name: Copy in the sync-fudcon cronjob - copy: src=cron-sync-fudcon dest=/etc/cron.d/sync-fudcon - tags: - - fedora-web - - fedora-web/fudcon - -- 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: - - fudcon.conf - - languages.conf - notify: - - reload proxyhttpd - tags: - - fedora-web - - fedora-web/fudcon diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index cda636997b..dd65c3ffd0 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -102,14 +102,6 @@ gid = root read only = yes hosts allow = 10.3.160.0/255.255.224.0 192.168.0.0/255.255.0.0 -[fudcon.fedoraproject.org] -comment = fudcon.fedoraproject.org -path = /srv/web/fudcon.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 - [flocktofedora.org] comment = flocktofedora.org path = /srv/web/flocktofedora.org diff --git a/roles/rsyncd/files/rsyncd.conf.sundries-stg b/roles/rsyncd/files/rsyncd.conf.sundries-stg index f978e4de9f..05d1f33cb8 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries-stg +++ b/roles/rsyncd/files/rsyncd.conf.sundries-stg @@ -102,14 +102,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 -[fudcon.fedoraproject.org] -comment = fudcon.fedoraproject.org -path = /srv/web/fudcon.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 - [flocktofedora.org] comment = flocktofedora.org path = /srv/web/flocktofedora.org