diff --git a/.gitignore b/.gitignore index ba5037c..d5ac5e0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ __pycache__/ *.py[cod] .stestr .\#* +.idea/ \ No newline at end of file diff --git a/.jujuignore b/.jujuignore index 8401cad..8f2fcd3 100644 --- a/.jujuignore +++ b/.jujuignore @@ -8,3 +8,4 @@ __pycache__/ *~ \#* *.swp +.idea/ \ No newline at end of file diff --git a/templates/apache-openidc-location.conf b/templates/apache-openidc-location.conf index dbd06be..43fbdf9 100644 --- a/templates/apache-openidc-location.conf +++ b/templates/apache-openidc-location.conf @@ -21,8 +21,8 @@ OIDCProviderTokenEndpointAuth {{ options.oidc_provider_token_endpoint_auth }} {% if options.oidc_provider_user_info_endpoint -%} OIDCProviderUserInfoEndpoint {{ options.oidc_provider_user_info_endpoint }} {% endif -%} -{% if options.oidc_provider_jwks_url -%} -OIDCProviderJwksUri {{ options.oidc_provider_jwks_url }} +{% if options.oidc_provider_jwks_uri -%} +OIDCProviderJwksUri {{ options.oidc_provider_jwks_uri }} {% endif -%} OIDCClientID {{ options.oidc_client_id }} @@ -35,13 +35,10 @@ OIDCRedirectURI {{ options.scheme }}://{{ options.hostname }}:{{ options.port }} {% if options.oidc_remote_user_claim -%} OIDCRemoteUserClaim {{ options.oidc_remote_user_claim }} {% endif -%} -{% if options.oidc_provider_jwks_uri -%} -OIDCProviderJwksUri {{ options.oidc_provider_jwks_uri }} -{% endif -%} {%- if options.enable_oauth %} -{%- if options.oidc_auth_verify_jwks_uri %} -OIDCOAuthVerifyJwksUri {{ options.oidc_auth_verify_jwks_uri }} +{%- if options.oidc_oauth_verify_jwks_uri %} +OIDCOAuthVerifyJwksUri {{ options.oidc_oauth_verify_jwks_uri }} {%- else %} OIDCOAuthIntrospectionEndpoint {{ options.oidc_oauth_introspection_endpoint|default(options.provider_metadata.introspection_endpoint) }} OIDCOAuthIntrospectionEndpointParams token_type_hint=access_token