From 5eccd911eee7541f4743fc3e20b17df6fa2573a8 Mon Sep 17 00:00:00 2001 From: sajolida <sajolida@pimienta.org> Date: Fri, 25 Feb 2022 17:55:44 -0600 Subject: [PATCH 1/3] Remove super duper old redirections --- templates/website/nginx/rewrite_rules.conf.erb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/templates/website/nginx/rewrite_rules.conf.erb b/templates/website/nginx/rewrite_rules.conf.erb index a0e387657..897092658 100644 --- a/templates/website/nginx/rewrite_rules.conf.erb +++ b/templates/website/nginx/rewrite_rules.conf.erb @@ -57,9 +57,6 @@ rewrite ^/customize/?$ /contribute/customize permanent; rewrite ^/doc/anonymous_internet/iceweasel/?$ /doc/anonymous_internet/Tor_Browser permanent; rewrite ^/doc/about/warning/?$ /doc/about/warnings permanent; rewrite ^/doc/anonymous_internet/icedove/?$ /doc/anonymous_internet/thunderbird permanent; -rewrite ^/doc/installing_onto_a_usb_stick/linux/?$ /install/linux/usb/overview permanent; -rewrite ^/doc/installing_onto_a_usb_stick/windows/?$ /install/win/usb/overview permanent; -rewrite ^/doc/installing_onto_a_usb_stick/mac/?$ /install/mac/usb/overview permanent; rewrite ^/doc/first_steps/bridge_mode/?$ /doc/first_steps/startup_options/bridge_mode permanent; rewrite ^/doc/first_steps/windows_theme/?$ /doc/first_steps/startup_options/windows_camouflage permanent; rewrite ^/doc/trusting_tails_signing_key/?$ "/install/download#openpgp" permanent; @@ -76,27 +73,16 @@ rewrite ^/doc/first_steps/usb_reset/linux/?$ /doc/first_steps/reset/linux perman rewrite ^/doc/first_steps/usb_reset/windows/?$ /doc/first_steps/reset/windows permanent; rewrite ^/doc/first_steps/usb_upgrade/?$ /doc/first_steps/upgrade permanent; rewrite ^/doc/first_steps/manual_usb_installation/?$ /install permanent; -rewrite ^/doc/first_steps/manual_usb_installation/linux/?$ /install/linux/usb/overview permanent; -rewrite ^/doc/first_steps/manual_usb_installation/windows/?$ /install/win/usb/overview permanent; -rewrite ^/doc/first_steps/manual_usb_installation/mac/?$ /install/mac/usb/overview permanent; rewrite ^/doc/sensitive_documents/audio/?$ /doc/sensitive_documents/sound_and_video permanent; rewrite ^/doc/first_steps/dvd/?$ /install/dvd permanent; rewrite ^/doc/first_steps/installation/?$ /install permanent; rewrite ^/doc/first_steps/installation/manual/?$ /install permanent; -rewrite ^/doc/first_steps/installation/manual/linux/?$ /install/linux/usb/overview permanent; -rewrite ^/doc/first_steps/installation/manual/mac/?$ /install/mac/usb/overview permanent; -rewrite ^/doc/first_steps/installation/manual/windows/?$ /install/win/usb/overview permanent; rewrite ^/doc/first_steps/startup_options/?$ /doc/first_steps/welcome_screen permanent; rewrite ^/doc/first_steps/startup_options/administration_password/?$ /doc/first_steps/welcome_screen/administration_password permanent; rewrite ^/doc/first_steps/startup_options/bridge_mode/?$ /doc/first_steps/welcome_screen/bridge_mode permanent; rewrite ^/doc/first_steps/startup_options/mac_spoofing/?$ /doc/first_steps/welcome_screen/mac_spoofing permanent; -rewrite ^/doc/get/trusting_tails_signing_key/?$ "/install/download#openpgp" permanent; -rewrite ^/doc/get/verify_the_iso_image_using_gnome/?$ "/install/download#openpgp" permanent; -rewrite ^/doc/get/verify_the_iso_image_using_other_operating_systems/?$ "/install/download#openpgp" permanent; -rewrite ^/doc/get/verify_the_iso_image_using_the_command_line/?$ "/install/download#openpgp" permanent; rewrite ^/doc/first_steps/bug_reporting/tails_does_not_start/?$ "/doc/first_steps/bug_reporting#does_not_start" permanent; rewrite ^/donate/canceled/submit/?$ /donate/canceled/feedback? redirect; -rewrite ^/download /install permanent; rewrite ^/features/?$ /doc/about/features permanent; rewrite ^/found_a_problem/?$ /support/found_a_problem permanent; rewrite ^/gdm/?$ /support/known_issues/graphics permanent; -- GitLab From 09074639d3fd68f782a1b67d9151173736c9f14e Mon Sep 17 00:00:00 2001 From: sajolida <sajolida@pimienta.org> Date: Fri, 25 Feb 2022 17:56:31 -0600 Subject: [PATCH 2/3] Remove redirections to pages that don't exist anymore --- templates/website/nginx/rewrite_rules.conf.erb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/templates/website/nginx/rewrite_rules.conf.erb b/templates/website/nginx/rewrite_rules.conf.erb index 897092658..1dc3690a7 100644 --- a/templates/website/nginx/rewrite_rules.conf.erb +++ b/templates/website/nginx/rewrite_rules.conf.erb @@ -90,23 +90,8 @@ rewrite ^/git/?$ /contribute/git permanent; rewrite ^/GnuPG_key/?$ /doc/about/openpgp_keys permanent; rewrite ^/install/os/?$ /install permanent; rewrite ^/install/debian/?$ /install/linux permanent; -rewrite ^/install/debian/clone/overview/?$ /install/debian/clone-overview permanent; -rewrite ^/install/debian/clone-overview/?$ /install/linux/clone-overview permanent; rewrite ^/install/debian/usb/?$ /install/linux/usb permanent; -rewrite ^/install/debian/usb-download/?$ /install/linux/usb-download permanent; -rewrite ^/install/debian/usb/overview/?$ /install/debian/usb-overview permanent; -rewrite ^/install/debian/usb-overview/?$ /install/linux/usb-overview permanent; -rewrite ^/install/expert/usb/overview/?$ /install/expert/usb-overview permanent; -rewrite ^/install/linux/clone/overview/?$ /install/linux/clone-overview permanent; -rewrite ^/install/linux/usb/overview/?$ /install/linux/usb-overview permanent; -rewrite ^/install/mac/clone/overview/?$ /install/mac/clone-overview permanent; rewrite ^/install/mac/dvd/?$ /install/mac/usb permanent; -rewrite ^/install/mac/dvd-download/?$ /install/mac/usb-download permanent; -rewrite ^/install/mac/dvd/overview/?$ /install/mac/dvd-overview permanent; -rewrite ^/install/mac/dvd-overview/?$ /install/mac/usb-overview permanent; -rewrite ^/install/mac/usb/overview/?$ /install/mac/usb-overview permanent; -rewrite ^/install/win/clone/overview/?$ /install/win/clone-overview permanent; -rewrite ^/install/win/usb/overview/?$ /install/win/usb-overview permanent; rewrite ^/install/download/openpgp/?$ "/install/download#openpgp" permanent; rewrite ^/install/vm/?$ /doc/advanced_topics/virtualization permanent; rewrite ^/license/?$ /doc/about/license permanent; @@ -1002,6 +987,4 @@ rewrite ^/todo/fix_documentation_for_ISO_verification_on_Windows https://redmine rewrite ^/todo/think_about_tordate_htpdate_changes https://redmine.tails.boum.org/code/issues/5424 permanent; rewrite ^/todo/include_arm https://redmine.tails.boum.org/code/issues/5884 permanent; rewrite ^/todo/add_virtualbox_host_software https://redmine.tails.boum.org/code/issues/5606 permanent; -rewrite ^/upgrade/clone/overview/?$ /upgrade/clone-overview permanent; -rewrite ^/upgrade/tails/overview/?$ /upgrade/tails-overview permanent; rewrite ^/wishlist/?$ /contribute/working_together/Redmine permanent; -- GitLab From 75350cef30ad2456749dafa61b0f60af5000873d Mon Sep 17 00:00:00 2001 From: sajolida <sajolida@pimienta.org> Date: Fri, 25 Feb 2022 18:05:00 -0600 Subject: [PATCH 3/3] Update to #16808 --- templates/website/nginx/rewrite_rules.conf.erb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/templates/website/nginx/rewrite_rules.conf.erb b/templates/website/nginx/rewrite_rules.conf.erb index 1dc3690a7..5491d0338 100644 --- a/templates/website/nginx/rewrite_rules.conf.erb +++ b/templates/website/nginx/rewrite_rules.conf.erb @@ -88,12 +88,16 @@ rewrite ^/found_a_problem/?$ /support/found_a_problem permanent; rewrite ^/gdm/?$ /support/known_issues/graphics permanent; rewrite ^/git/?$ /contribute/git permanent; rewrite ^/GnuPG_key/?$ /doc/about/openpgp_keys permanent; +rewrite ^/install/win/?$ /install/windows permanent; +rewrite ^/install/win/usb?$ /install/windows permanent; +rewrite ^/install/win/clone?$ /install/windows permanent; +rewrite ^/install/mac/usb?$ /install/mac permanent; +rewrite ^/install/mac/clone?$ /install/clone/mac permanent; +rewrite ^/install/linux/usb?$ /install/linux permanent; +rewrite ^/install/linux/clone?$ /install/clone/pc permanent; +rewrite ^/install/expert/usb?$ /install/expert permanent; rewrite ^/install/os/?$ /install permanent; rewrite ^/install/debian/?$ /install/linux permanent; -rewrite ^/install/debian/usb/?$ /install/linux/usb permanent; -rewrite ^/install/mac/dvd/?$ /install/mac/usb permanent; -rewrite ^/install/download/openpgp/?$ "/install/download#openpgp" permanent; -rewrite ^/install/vm/?$ /doc/advanced_topics/virtualization permanent; rewrite ^/license/?$ /doc/about/license permanent; rewrite ^/news/bounties_2013_report/?$ /news/report_2013_bounties permanent; rewrite ^/news/Call_for_help:_improve_the_infrastructure_behind_Tails/?$ /news/improve_the_infrastructure_behind_Tails permanent; @@ -987,4 +991,5 @@ rewrite ^/todo/fix_documentation_for_ISO_verification_on_Windows https://redmine rewrite ^/todo/think_about_tordate_htpdate_changes https://redmine.tails.boum.org/code/issues/5424 permanent; rewrite ^/todo/include_arm https://redmine.tails.boum.org/code/issues/5884 permanent; rewrite ^/todo/add_virtualbox_host_software https://redmine.tails.boum.org/code/issues/5606 permanent; +rewrite ^/upgrade/win/?$ /upgrade/windows permanent; rewrite ^/wishlist/?$ /contribute/working_together/Redmine permanent; -- GitLab