From ea3ee34539bfd65f0b2b9fdb77f7ef35f4cd0a3f Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 21 Jan 2016 19:37:48 +0000 Subject: [PATCH] Add flocktofedora.org Signed-off-by: Patrick Uiterwijk --- roles/fedora-web/build/files/syncStatic.sh | 1 + .../fedora-web/build/files/syncStatic.stg.sh | 1 + .../build/files/syncTranslations.sh | 1 + roles/fedora-web/build/tasks/main.yml | 1 + .../flocktofedora/files/cron-sync-getfedora | 1 + .../files/flocktofedora.org.conf | 9 ++ .../flocktofedora/files/languages.conf | 144 ++++++++++++++++++ roles/fedora-web/flocktofedora/tasks/main.yml | 18 +++ roles/rsyncd/files/rsyncd.conf.sundries | 8 + 9 files changed, 184 insertions(+) create mode 100644 roles/fedora-web/flocktofedora/files/cron-sync-getfedora create mode 100644 roles/fedora-web/flocktofedora/files/flocktofedora.org.conf create mode 100644 roles/fedora-web/flocktofedora/files/languages.conf create mode 100644 roles/fedora-web/flocktofedora/tasks/main.yml diff --git a/roles/fedora-web/build/files/syncStatic.sh b/roles/fedora-web/build/files/syncStatic.sh index 0a90314bce..91c988bfd8 100644 --- a/roles/fedora-web/build/files/syncStatic.sh +++ b/roles/fedora-web/build/files/syncStatic.sh @@ -63,6 +63,7 @@ popd > /dev/null /usr/bin/git pull -q --ff-only || exit 1 build getfedora.org +build flocktofedora.org build spins.fedoraproject.org build boot.fedoraproject.org build fedoracommunity.org diff --git a/roles/fedora-web/build/files/syncStatic.stg.sh b/roles/fedora-web/build/files/syncStatic.stg.sh index ce4e84e807..dea52b8ce8 100644 --- a/roles/fedora-web/build/files/syncStatic.stg.sh +++ b/roles/fedora-web/build/files/syncStatic.stg.sh @@ -52,6 +52,7 @@ build spins.fedoraproject.org build labs.fedoraproject.org build arm.fedoraproject.org build getfedora.org +build flocktofedora.org pushd mirrors.fedoraproject.org > /dev/null rsync -qa --delete-after --delay-updates . /srv/web/mirrors.fedoraproject.org/ diff --git a/roles/fedora-web/build/files/syncTranslations.sh b/roles/fedora-web/build/files/syncTranslations.sh index 1fe566f703..d72ef400c1 100644 --- a/roles/fedora-web/build/files/syncTranslations.sh +++ b/roles/fedora-web/build/files/syncTranslations.sh @@ -8,6 +8,7 @@ SITES="boot.fedoraproject.org \ fedorahosted.org \ fedoraproject.org \ getfedora.org \ + flocktofedora.org \ spins.fedoraproject.org \ labs.fedoraproject.org \ arm.fedoraproject.org \ diff --git a/roles/fedora-web/build/tasks/main.yml b/roles/fedora-web/build/tasks/main.yml index bb1f3815f0..962d06e75a 100644 --- a/roles/fedora-web/build/tasks/main.yml +++ b/roles/fedora-web/build/tasks/main.yml @@ -35,6 +35,7 @@ - fedoracommunity.org - fudcon.fedoraproject.org - getfedora.org + - flocktofedora.org - arm.fedoraproject.org - labs.fedoraproject.org tags: diff --git a/roles/fedora-web/flocktofedora/files/cron-sync-getfedora b/roles/fedora-web/flocktofedora/files/cron-sync-getfedora new file mode 100644 index 0000000000..1e01148abd --- /dev/null +++ b/roles/fedora-web/flocktofedora/files/cron-sync-getfedora @@ -0,0 +1 @@ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::flocktofedora.org/ /srv/web/flocktofedora.org/ diff --git a/roles/fedora-web/flocktofedora/files/flocktofedora.org.conf b/roles/fedora-web/flocktofedora/files/flocktofedora.org.conf new file mode 100644 index 0000000000..e21b4af73b --- /dev/null +++ b/roles/fedora-web/flocktofedora/files/flocktofedora.org.conf @@ -0,0 +1,9 @@ +DocumentRoot /srv/web/flocktofedora.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 5 days" diff --git a/roles/fedora-web/flocktofedora/files/languages.conf b/roles/fedora-web/flocktofedora/files/languages.conf new file mode 100644 index 0000000000..d68bb4f79d --- /dev/null +++ b/roles/fedora-web/flocktofedora/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/flocktofedora.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/flocktofedora/tasks/main.yml b/roles/fedora-web/flocktofedora/tasks/main.yml new file mode 100644 index 0000000000..0313d2de11 --- /dev/null +++ b/roles/fedora-web/flocktofedora/tasks/main.yml @@ -0,0 +1,18 @@ +- name: Copy in the sync-flocktofedora cronjob + copy: src=cron-sync-flocktofedora dest=/etc/cron.d/sync-flocktofedora + tags: + - fedora-web + - fedora-web/flocktofedora + +- 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: + - flocktofedora.org.conf + - languages.conf + notify: + - reload httpd + tags: + - fedora-web + - fedora-web/flocktofedora diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries index 8e143cd1c2..b1bc861e7a 100644 --- a/roles/rsyncd/files/rsyncd.conf.sundries +++ b/roles/rsyncd/files/rsyncd.conf.sundries @@ -110,6 +110,14 @@ gid = root read only = yes hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 +[flocktofedora.org] +comment = flocktofedora.org +path = /srv/web/flocktofedora.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 + [getfedora.org] comment = getfedora.org path = /srv/web/getfedora.org