diff --git a/doc/admin-guide/source/keystone-caching-layer.rst b/doc/admin-guide/source/identity-caching-layer.rst similarity index 100% rename from doc/admin-guide/source/keystone-caching-layer.rst rename to doc/admin-guide/source/identity-caching-layer.rst diff --git a/doc/admin-guide/source/keystone-certificates-for-pki.rst b/doc/admin-guide/source/identity-certificates-for-pki.rst similarity index 100% rename from doc/admin-guide/source/keystone-certificates-for-pki.rst rename to doc/admin-guide/source/identity-certificates-for-pki.rst diff --git a/doc/admin-guide/source/keystone-domain-specific-config.rst b/doc/admin-guide/source/identity-domain-specific-config.rst similarity index 100% rename from doc/admin-guide/source/keystone-domain-specific-config.rst rename to doc/admin-guide/source/identity-domain-specific-config.rst diff --git a/doc/admin-guide/source/keystone-external-authentication.rst b/doc/admin-guide/source/identity-external-authentication.rst similarity index 100% rename from doc/admin-guide/source/keystone-external-authentication.rst rename to doc/admin-guide/source/identity-external-authentication.rst diff --git a/doc/admin-guide/source/keystone-fernet-token-faq.rst b/doc/admin-guide/source/identity-fernet-token-faq.rst similarity index 100% rename from doc/admin-guide/source/keystone-fernet-token-faq.rst rename to doc/admin-guide/source/identity-fernet-token-faq.rst diff --git a/doc/admin-guide/source/keystone-integrate-identity-backend-ldap.rst b/doc/admin-guide/source/identity-integrate-identity-backend-ldap.rst similarity index 100% rename from doc/admin-guide/source/keystone-integrate-identity-backend-ldap.rst rename to doc/admin-guide/source/identity-integrate-identity-backend-ldap.rst diff --git a/doc/admin-guide/source/keystone-integrate-with-ldap.rst b/doc/admin-guide/source/identity-integrate-with-ldap.rst similarity index 97% rename from doc/admin-guide/source/keystone-integrate-with-ldap.rst rename to doc/admin-guide/source/identity-integrate-with-ldap.rst index 324523b371..8626d8d5bc 100644 --- a/doc/admin-guide/source/keystone-integrate-with-ldap.rst +++ b/doc/admin-guide/source/identity-integrate-with-ldap.rst @@ -7,8 +7,8 @@ Integrate Identity with LDAP .. toctree:: :maxdepth: 2 - keystone-integrate-identity-backend-ldap.rst - keystone-secure-identity-to-ldap-backend.rst + identity-integrate-identity-backend-ldap.rst + identity-secure-identity-to-ldap-backend.rst The OpenStack Identity service supports integration with existing LDAP directories for authentication and authorization services. LDAP back diff --git a/doc/admin-guide/source/identity-management.rst b/doc/admin-guide/source/identity-management.rst index 68c41a51e8..8e78e4cc03 100644 --- a/doc/admin-guide/source/identity-management.rst +++ b/doc/admin-guide/source/identity-management.rst @@ -15,15 +15,15 @@ command-line client. :maxdepth: 1 identity-concepts.rst - keystone-certificates-for-pki.rst - keystone-domain-specific-config.rst - keystone-external-authentication.rst - keystone-integrate-with-ldap.rst - keystone-tokens.rst - keystone-token-binding.rst - keystone-fernet-token-faq.rst - keystone-use-trusts.rst - keystone-caching-layer.rst + identity-certificates-for-pki.rst + identity-domain-specific-config.rst + identity-external-authentication.rst + identity-integrate-with-ldap.rst + identity-tokens.rst + identity-token-binding.rst + identity-fernet-token-faq.rst + identity-use-trusts.rst + identity-caching-layer.rst identity-keystone-usage-and-features.rst identity-auth-token-middleware.rst identity-service-api-protection.rst diff --git a/doc/admin-guide/source/keystone-secure-identity-to-ldap-backend.rst b/doc/admin-guide/source/identity-secure-identity-to-ldap-backend.rst similarity index 100% rename from doc/admin-guide/source/keystone-secure-identity-to-ldap-backend.rst rename to doc/admin-guide/source/identity-secure-identity-to-ldap-backend.rst diff --git a/doc/admin-guide/source/keystone-token-binding.rst b/doc/admin-guide/source/identity-token-binding.rst similarity index 100% rename from doc/admin-guide/source/keystone-token-binding.rst rename to doc/admin-guide/source/identity-token-binding.rst diff --git a/doc/admin-guide/source/keystone-tokens.rst b/doc/admin-guide/source/identity-tokens.rst similarity index 97% rename from doc/admin-guide/source/keystone-tokens.rst rename to doc/admin-guide/source/identity-tokens.rst index 99fe776bb5..394dd336b3 100644 --- a/doc/admin-guide/source/keystone-tokens.rst +++ b/doc/admin-guide/source/identity-tokens.rst @@ -88,7 +88,7 @@ information stored in the token and integrity is verified with a ``SHA256 HMAC`` signature. Only the Identity service should have access to the keys used to encrypt and decrypt fernet tokens. Like UUID tokens, fernet tokens must be passed back to the Identity service in order to validate them. For more -information on the fernet token type, see the :doc:`keystone-fernet-token-faq`. +information on the fernet token type, see the :doc:`identity-fernet-token-faq`. PKI and PKIZ tokens ~~~~~~~~~~~~~~~~~~~ @@ -101,4 +101,4 @@ pairs and certificates in order to create and validate PKI tokens. The same concepts from PKI tokens apply to PKIZ tokens. The only difference between the two is PKIZ tokens are compressed to help mitigate the size issues of PKI. For more information on the certificate setup for PKI and PKIZ tokens, -see the :doc:`keystone-certificates-for-pki`. +see the :doc:`identity-certificates-for-pki`. diff --git a/doc/admin-guide/source/keystone-use-trusts.rst b/doc/admin-guide/source/identity-use-trusts.rst similarity index 100% rename from doc/admin-guide/source/keystone-use-trusts.rst rename to doc/admin-guide/source/identity-use-trusts.rst diff --git a/doc/config-reference/source/identity/config-options.rst b/doc/config-reference/source/identity/config-options.rst index 59b63720c7..6493c134ef 100644 --- a/doc/config-reference/source/identity/config-options.rst +++ b/doc/config-reference/source/identity/config-options.rst @@ -42,5 +42,5 @@ installed on an SQL or LDAP back end, and supports domain-specific Identity configuration options, which are stored in domain-specific configuration files. See the `Admin guide Identity Management Chapter -`_ +`_ for more information. diff --git a/www/static/.htaccess b/www/static/.htaccess index e0013c7a54..cfe36cd258 100644 --- a/www/static/.htaccess +++ b/www/static/.htaccess @@ -230,19 +230,31 @@ redirect 301 /admin-guide/identity_management.html /admin-guide/identity-managem redirect 301 /admin-guide/identity_service_api_protection.html /admin-guide/identity-service-api-protection.html redirect 301 /admin-guide/identity_start.html /admin-guide/identity-start.html redirect 301 /admin-guide/identity_troubleshoot.html /admin-guide/identity-troubleshoot.html -redirect 301 /admin-guide/keystone_caching_layer.html /admin-guide/keystone-caching-layer.html -redirect 301 /admin-guide/keystone_certificates_for_pki.html /admin-guide/keystone-certificates-for-pki.html -redirect 301 /admin-guide/keystone_configure_with_SSL.html /admin-guide/keystone-configure-with-SSL.html -redirect 301 /admin-guide/keystone_domain_specific_config.html /admin-guide/keystone-domain-specific-config.html -redirect 301 /admin-guide/keystone_external_authentication.html /admin-guide/keystone-external-authentication.html -redirect 301 /admin-guide/keystone_fernet_token_faq.html /admin-guide/keystone-fernet-token-faq.html -redirect 301 /admin-guide/keystone_integrate_assignment_backend_ldap.html /admin-guide/keystone-integrate-assignment-backend-ldap.html -redirect 301 /admin-guide/keystone_integrate_identity_backend_ldap.html /admin-guide/keystone-integrate-identity-backend-ldap.html -redirect 301 /admin-guide/keystone_integrate_with_ldap.html /admin-guide/keystone-integrate-with-ldap.html -redirect 301 /admin-guide/keystone_secure_identity_to_ldap_backend.html /admin-guide/keystone-secure-identity-to-ldap-backend.html -redirect 301 /admin-guide/keystone_token-binding.html /admin-guide/keystone-token-binding.html -redirect 301 /admin-guide/keystone_tokens.html /admin-guide/keystone-tokens.html -redirect 301 /admin-guide/keystone_use_trusts.html /admin-guide/keystone-use-trusts.html + +redirect 301 /admin-guide/keystone_caching_layer.html /admin-guide/identity-caching-layer.html +redirect 301 /admin-guide/keystone_certificates_for_pki.html /admin-guide/identity-certificates-for-pki.html +redirect 301 /admin-guide/keystone_domain_specific_config.html /admin-guide/identity-domain-specific-config.html +redirect 301 /admin-guide/keystone_external_authentication.html /admin-guide/identity-external-authentication.html +redirect 301 /admin-guide/keystone_fernet_token_faq.html /admin-guide/identity-fernet-token-faq.html +redirect 301 /admin-guide/keystone_integrate_identity_backend_ldap.html /admin-guide/identity-integrate-identity-backend-ldap.html +redirect 301 /admin-guide/keystone_integrate_with_ldap.html /admin-guide/identity-integrate-with-ldap.html +redirect 301 /admin-guide/keystone_secure_identity_to_ldap_backend.html /admin-guide/identity-secure-identity-to-ldap-backend.html +redirect 301 /admin-guide/keystone_token-binding.html /admin-guide/identity-token-binding.html +redirect 301 /admin-guide/keystone_tokens.html /admin-guide/identity-tokens.html +redirect 301 /admin-guide/keystone_use_trusts.html /admin-guide/identity-use-trusts.html + +redirect 301 /admin-guide/keystone-caching-layer.html /admin-guide/identity-caching-layer.html +redirect 301 /admin-guide/keystone-certificates-for-pki.html /admin-guide/identity-certificates-for-pki.html +redirect 301 /admin-guide/keystone-domain-specific-config.html /admin-guide/identity-domain-specific-config.html +redirect 301 /admin-guide/keystone-external-authentication.html /admin-guide/identity-external-authentication.html +redirect 301 /admin-guide/keystone-fernet-token-faq.html /admin-guide/identity-fernet-token-faq.html +redirect 301 /admin-guide/keystone-integrate-identity-backend_ldap.html /admin-guide/identity-integrate-identity-backend-ldap.html +redirect 301 /admin-guide/keystone-integrate-with-ldap.html /admin-guide/identity-integrate-with-ldap.html +redirect 301 /admin-guide/keystone-secure-identity-to-ldap_backend.html /admin-guide/identity-secure-identity-to-ldap-backend.html +redirect 301 /admin-guide/keystone-token-binding.html /admin-guide/identity-token-binding.html +redirect 301 /admin-guide/keystone-tokens.html /admin-guide/identity-tokens.html +redirect 301 /admin-guide/keystone-use-trusts.html /admin-guide/identity-use-trusts.html + redirect 301 /admin-guide/networking_adv-config.html /admin-guide/networking-adv-config.html redirect 301 /admin-guide/networking_adv-features.html /admin-guide/networking-adv-features.html redirect 301 /admin-guide/networking_adv-operational-features.html /admin-guide/networking-adv-operational-features.html