diff --git a/redirects/.htaccess b/redirects/.htaccess index 5ba2baeef..aa7c859de 100644 --- a/redirects/.htaccess +++ b/redirects/.htaccess @@ -17,6 +17,8 @@ #RedirectMatch 302 "^(/[a-z][a-z])?/path/to/old_article$" "$1/path/to/new_article" #RedirectMatch 301 "^(/[a-z][a-z])?/(fido2|nitrokey3|hsm|u2f|storage|start|pro|passkey)(/linux|/windows|/mac)?$" "$1/nitrokeys/$2" + + # FIDO2 RedirectMatch 301 "^(/[a-z][a-z])?/fido2/(mac/|windows/|linux/)?2fa-nextcloud$" "$1/nitrokeys/features/fido2/nextcloud" RedirectMatch 301 "^(/[a-z][a-z])?/fido2/(mac/|windows/|linux/)?2fa-odoo$" "$1/nitrokeys/features/u2f/odoo" @@ -26,13 +28,14 @@ RedirectMatch 301 "^(/[a-z][a-z])?/fido2/(mac/|windows/|linux/)reset$" "$1/nitro RedirectMatch 301 "^(/[a-z][a-z])?/fido2/linux/desktop-login$" "$1/nitrokeys/features/u2f/desktop-login" RedirectMatch 301 "^(/[a-z][a-z])?/fido2/windows/passwordless-microsoft$" "$1/nitrokeys/features/fido2/passwordless-microsoft" + # Nitrokey Passkey # Nitrokey U2F RedirectMatch 301 "^(/[a-z][a-z])?/u2f/(mac/|windows/|linux/)index$" "$1/nitrokeys/u2f/getting-started" RedirectMatch 301 "^(/[a-z][a-z])?/u2f/(mac/|windows/|linux/)?2fa-nextcloud$" "$1/nitrokeys/features/fido2/nextcloud" RedirectMatch 301 "^(/[a-z][a-z])?/u2f/(mac/|windows/|linux/)?2fa-odoo$" "$1/nitrokeys/features/u2f/odoo" -RedirectMatch 301 "^(/[a-z][a-z])?/fido2/linux/desktop-login$" "$1/nitrokeys/features/u2f/desktop-login" +RedirectMatch 301 "^(/[a-z][a-z])?/u2f/linux/desktop-login$" "$1/nitrokeys/features/u2f/desktop-login" # Nitrokey Storage RedirectMatch 301 "^(/[a-z][a-z])?/storage/(mac/|windows/|linux/)?factory-reset$" "$1/nitrokeys/storage/factory-reset" @@ -169,6 +172,7 @@ RedirectMatch 301 "^(/[a-z][a-z])?/nitrokey3/windows/piv/key_management$" "$1/ni RedirectMatch 301 "^(/[a-z][a-z])?/nitrokey3/windows/piv/guides/index$" "$1/nitrokeys/features/piv/guides/index" RedirectMatch 301 "^(/[a-z][a-z])?/nitrokey3/windows/piv/guides/client_logon_with_active_directory$" "$1/nitrokeys/features/piv/guides/client_logon_with_active_directory" + # Nitrokey HSM RedirectMatch 301 "^(/[a-z][a-z])?/hsm/(mac/|windows/|linux/)index$" "$1/nitrokeys/hsm/getting-started" @@ -190,10 +194,10 @@ RedirectMatch 301 "^(/[a-z][a-z])?/hsm/(mac/|windows/|linux/)dnssec$" "$1/nitrok +# found in the wild +RedirectMatch 301 "^(/[a-z][a-z])?/nitrokeys/nitrokey3/openpgp-keygen-backup$" "$1/nitrokeys/features/openpgp-card/openpgp-keygen-backup" - +# generics and fallbacks RedirectMatch 301 "^(/[a-z][a-z])?/(fido2|nitrokey3|hsm|u2f|storage|start|pro|passkey)(/linux|/windows|/mac)?(.*)$" "$1/nitrokeys/$2$4" - -