FSFE/fsfe-website
25
31
Fork 91
Code Issues 64 Pull Requests 6 Wiki Activity

create redirects for various pages on /freesoftware, /about and /documents, and improve a few existing ones
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
Max Mehl 2020-04-22 17:15:46 +02:00
parent 47f6bcba27
commit c935b089f1
Signed by: max.mehl
GPG Key ID: 2704E4AB371E2E92
1 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
.htaccess
View File

@ -105,6 +105,12 @@ RewriteRule ^activities/ftf/education.*$ /activities/ftf/services.html [R=301,L]
RewriteRule ^news/fsfe-fr-channel.fr.xml /news/news.fr.rss [R=301,L]
RewriteRule ^2009/?$ /news/2009/nyr.html [R=301,L]
RewriteRule ^news/2016/news-20160629-01(.*)$ /news/2016/news-20160630-01$1 [R=301,L]
RewriteRule ^about/reports/es-2003(.*)$ /news/2003/news-20030602-01$1 [R=301,L]
RewriteRule ^about/reports/es-2005(.*)$ /news/2005/news-20050507-01$1 [R=301,L]
RewriteRule ^about/reports/es-2007(.*)$ /news/2007/news-20070630-01$1 [R=301,L]
RewriteRule ^about/reports/es-2009(.*)$ /news/2009/news-20090620-01$1 [R=301,L]
RewriteRule ^freesoftware/enterprise/freesoftwarecompany(.*)$ /news/2018/news-20181202-01$1 [R=301,L]
RewriteRule ^freesoftware/enterprise/chargeofitsbrand(.*)$ /news/2009/news-20090604-01$1 [R=301,L]
# Old staff profiles
RewriteRule ^about/(bako|polvani|tuke|maffulli|jakobs|oriordan)(/.*)?$ /about/team [R=301,L]
@ -130,7 +136,7 @@ RewriteRule ^tags/tagged(\...)(\.html)?$ /tags/tags$1.html [R=301,L]
# Documents
RewriteRule ^documents/fp6(.*) /projects/fp6$1 [R=301,L]
RewriteRule ^documents/whatwedo(.*) /about/basics/whatwedo$1 [R=301,L]
RewriteRule ^documents/gnuproject(.*) /freesoftware/basics/gnuproject$1 [R=301,L]
RewriteRule ^documents/gnuproject(.*) /freesoftware/gnuproject$1 [R=301,L]
RewriteRule ^documents/whyweexist(.*) /about/basics/whyweexist$1 [R=301,L]
RewriteRule ^documents/freesoftware(.*) /about/basics/freesoftware$1 [R=301,L]
RewriteRule ^documents/preamble(.*) /about/history/preamble$1 [R=301,L]
@ -141,45 +147,31 @@ RewriteRule ^documents/wiwo(.*) /projects/wipo/wiwo$1 [R=301,L]
RewriteRule ^documents/printable/(.*) /about/printable/$1 [R=301,L]
RewriteRule ^documents/reports/(.*) /about/reports/$1 [R=301,L]
RewriteRule ^documents/rms-fs-2006-03-09(.*) /freesoftware/transcripts/rms-fs-2006-03-09$1 [R=301,L]
RewriteRule ^documents/whyfs(.*)$ /campaigns/whyfs/ [R=301,L]
# Projects
RewriteRule ^projects/agnula(.*) /campaigns/agnula$1 [R=301,L]
RewriteRule ^projects/bgw(.*) /campaigns/bgw$1 [R=301,L]
RewriteRule ^projects/browserbundling(.*) /campaigns/browserbundling$1 [R=301,L]
RewriteRule ^projects/btw09(.*) /campaigns/btw09$1 [R=301,L]
RewriteRule ^projects/eucd(.*) /campaigns/eucd$1 [R=301,L]
RewriteRule ^projects/gbn(.*) /campaigns/gbn$1 [R=301,L]
RewriteRule ^projects/gplv3(.*) /campaigns/gplv3$1 [R=301,L]
RewriteRule ^projects/horizon2020(.*) /campaigns/horizon2020$1 [R=301,L]
RewriteRule ^projects/ipred2(.*) /campaigns/ipred2$1 [R=301,L]
RewriteRule ^projects/mankind(.*) /campaigns/mankind$1 [R=301,L]
RewriteRule ^projects/pdfreaders(.*) /campaigns/pdfreaders$1 [R=301,L]
RewriteRule ^projects/self(.*) /campaigns/self$1 [R=301,L]
RewriteRule ^projects/stacs(.*) /campaigns/stacs$1 [R=301,L]
RewriteRule ^projects/swpat(.*) /campaigns/swpat$1 [R=301,L]
RewriteRule ^projects/wsis(.*) /campaigns/wsis$1 [R=301,L]
RewriteRule ^projects/active(.*)html$ /campaigns/campaigns$1html [R=301,L]
RewriteRule ^projects/finished(.*)html$ /campaigns/campaigns$1html [R=301,L]
RewriteRule ^projects/inactive(.*)html$ /campaigns/campaigns$1html [R=301,L]
RewriteRule ^projects/drm(.*) /activities/drm$1 [R=301,L]
RewriteRule ^projects/education(.*) /activities/education$1 [R=301,L]
RewriteRule ^projects/os(.*) /activities/os$1 [R=301,L]
RewriteRule ^projects/procurement(.*) /activities/procurement$1 [R=301,L]
RewriteRule ^projects/eu(.*) /activities/eu$1 [R=301,L]
RewriteRule ^projects/ftf(.*) /activities/ftf$1 [R=301,L]
RewriteRule ^projects/fla(.*) /activities/ftf$1 [R=301,L]
RewriteRule ^projects/ms-vs-eu(.*) /activities/ms-vs-eu$1 [R=301,L]
RewriteRule ^projects/un(.*) /activities/un$1 [R=301,L]
RewriteRule ^projects/wipo(.*) /activities/wipo$1 [R=301,L]
RewriteRule ^projects/fp6(.*) /activities/fp6$1 [R=301,L]
RewriteRule ^projects/fp7(.*) /activities/fp7$1 [R=301,L]
RewriteRule ^projects/map(.*) /activities/map$1 [R=301,L]
RewriteRule ^projects/igf(.*) /activities/igf$1 [R=301,L]
# moved to campaigns/
RewriteRule ^projects/(agnula|bgw|browserbundling|btw09|eucd|gbn|gplv3|horizon2020|ipred2|mankind|pdfreaders|self|stacs|swpat|wsis)(.*)$ /campaigns/$1$2 [R=301,L]
RewriteRule ^projects/active(.*)$ /campaigns/campaigns$1 [R=301,L]
RewriteRule ^projects/finished(.*)$ /campaigns/campaigns$1 [R=301,L]
RewriteRule ^projects/inactive(.*)$ /campaigns/campaigns$1 [R=301,L]
# moved to activities/
RewriteRule ^projects/(drm|education|os|procurement|eu|ftf|fla|ms-vs-eu|un|wipo|fp6|fp7|map|igf)(.*)$ /activities/$1$2 [R=301,L]
RewriteRule ^projects/work(.*) /work$1 [R=301,L]
RewriteRule ^projects/leaflet-fellowship-FSA(.*) /about/printable/leaflet-fellowship-FSA$1 [R=301,L]
RewriteRule ^projects(/.*)?$ /campaigns/ [R=301,L]
# /freesoftware, /about/basics and similar "basic" texts
RewriteRule ^about/basics/?(.*)$ /freesoftware/ [R=301,L]
RewriteRule ^freesoftware/basics/(comparison|gnuproject)(.*)$ /freesoftware/$1$2 [R=301,L]
RewriteRule ^freesoftware/basics/legal/?(.*)$ /activities/ftf/ [R=301,L]
RewriteRule ^freesoftware/education/?(.*)$ /activities/education/ [R=301,L]
RewriteRule ^freesoftware/society/?(.*)$ /freesoftware/democracy.html [R=301,L]
RewriteRule ^freesoftware/legal/flashingdevices(.*)$ /campaigns/android/flashingdevices$1 [R=301,L]
RewriteRule ^freesoftware/public-sector/german-foreign-office-comment(.*)$ https://k7r.eu/buchartikel-freie-software-im-auswartigen-amt-erst-hu-dann-hott/ [R=301,L]
RewriteRule ^freesoftware/(basics|enterprise|support|third-sector|transcripts)/?(.*)$ /freesoftware/ [R=301,L]
# Other pages
RewriteRule ^about/(history|reports)/?(.*)$ /about/ [R=301,L]
RewriteRule ^about/members(/.*)?$ /about/team$1 [R=301,L]
RewriteRule ^about/community(/.*)?$ /contact/community.html [R=301,L]
RewriteRule ^about/self-conception(/.*)?$ /about/principles$1 [R=301,L]
@ -200,7 +192,6 @@ RewriteRule ^contribute/donate(.*) /donate$1 [R=301,L]
RewriteRule ^contact/local(.*) /about/localteams$1 [R=301,L]
RewriteRule ^fr/(news|events)\.(..\.)?html /fr/fr.$2html [R=301,L]
RewriteRule ^campaigns/wsis/cs-benchmarks\.(.*)$ /campaigns/wsis/cs-benchmarks-03-11-14.$1 [R=301,L]
RewriteRule ^freesoftware/education/argumentation(.*)$ /freesoftware/education/education$1 [R=301,L]
RewriteRule ^contribute/translators\.(.*) /contribute/translators/translators.$1 [R=301,L]
RewriteRule ^contribute/booth(.*) https://wiki.fsfe.org/KnowHow/Groups/OrganizeABooth [R=301,L]
@ -248,6 +239,7 @@ RewriteRule ^login(/.*)?$ https://my.fsfe.org/ [R=301,L]
# Old pages
RewriteRule ^about/printable(/.*)?$ /contribute/spreadtheword/ [R=301,L]
RewriteRule ^projects/leaflet-fellowship-FSA(.*) /contribute/spreadtheword/ [R=301,L]
# =============================================================================