From b4fb745f9f7912a5699a7cd24967ce983bf5947c Mon Sep 17 00:00:00 2001 From: vjrj Date: Mon, 10 Oct 2022 09:22:33 +0200 Subject: [PATCH] More OIDC related variables (#626) --- .../templates/config/collectory-config.properties | 4 ++-- .../logger-service/templates/logger-config.properties | 2 ++ .../templates/specieslist-webapp-config.properties | 10 +++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ansible/roles/collectory/templates/config/collectory-config.properties b/ansible/roles/collectory/templates/config/collectory-config.properties index f994d452f..d0b07c07d 100644 --- a/ansible/roles/collectory/templates/config/collectory-config.properties +++ b/ansible/roles/collectory/templates/config/collectory-config.properties @@ -159,8 +159,8 @@ citation.link.template = {{ citation_link_template | default('For more informati suitableFor = {{ collection_suitable_for | default('[{"spListNational":"Species list national"}, {"spListState": "Species list state"}, {"spListGreaterThan1000": "Species list >1000km radius"}, {"spList100to1000": "Species list 100-1000km radius"}, {"spList10to100":"Species list 10k to 100km radius"}, {"spListLessThan10":"Species list <10km radius"}, {"speciesDistribution":"Defining a species distribution"}, {"quantifyAbundance":"Quantifying abundance at a point in time"}, {"quantifyChange": "Quantifying change over time"}, {"other":"Other"}]')}} # oidc related -security.cas.enabled={{ collectory_cas_enabled | default(true) }} -security.oidc.enabled={{ collectory_oidc_enabled | default(false) }} +security.cas.enabled={{ security_cas_enabled | default(true) }} +security.oidc.enabled={{ security_oidc_enabled | default(false) }} security.oidc.clientId={{ clientId | default('') }} security.oidc.secret={{ secret | default('') }} security.oidc.discoveryUri={{ discoveryUri | default('') }} diff --git a/ansible/roles/logger-service/templates/logger-config.properties b/ansible/roles/logger-service/templates/logger-config.properties index dbc095ede..090098d20 100644 --- a/ansible/roles/logger-service/templates/logger-config.properties +++ b/ansible/roles/logger-service/templates/logger-config.properties @@ -57,6 +57,8 @@ skin.orgSupportEmail={{ orgSupportEmail | default('support@ala.org.au') }} privacyPolicy={{ privacy_policy_url | default('https://www.ala.org.au/about/terms-of-use/privacy-policy/') }} #oidc related ++security.cas.enabled={{ security_cas_enabled | default(true) }} ++security.oidc.enabled={{ security_oidc_enabled | default(false) }} security.oidc.clientId={{ clientId | default('') }} security.oidc.secret={{ secret | default('') }} security.oidc.discoveryUri={{ discoveryUri | default('') }} diff --git a/ansible/roles/species-list/templates/specieslist-webapp-config.properties b/ansible/roles/species-list/templates/specieslist-webapp-config.properties index e2de05ca9..84d8130fa 100644 --- a/ansible/roles/species-list/templates/specieslist-webapp-config.properties +++ b/ansible/roles/species-list/templates/specieslist-webapp-config.properties @@ -54,7 +54,7 @@ skin.orgNameShort = {{ orgNameShort | default('ALA') }} bieService.baseURL={{ bie_service_base_url }} bie.download=/data/bie-staging/species-list bie.nameIndexLocation={{ name_index_dir | default('/data/lucene/namematching') }} -namematching.serviceURL={{ name_matching_service_url | default('https://namematching-ws.ala.org.au')}} +namematching.serviceURL={{ namematching_service_url | default(name_matching_service_url | default('https://namematching-ws.ala.org.au'))}} logger.baseURL={{ (logger_service_url | default(logger_webservice_url)) | default('https://logger.ala.org.au/service')}} logger.baseUrl={{ (logger_service_url | default(logger_webservice_url)) | default('https://logger.ala.org.au/service')}} @@ -87,6 +87,8 @@ spatial.baseURL={{ spatial_base_url | default('https://spatial.ala.org.au')}} iconicSpecies.uid={{ iconic_species_uid | default('dr781')}} #oidc related +security.cas.enabled={{ security_cas_enabled | default(true) }} +security.oidc.enabled={{ security_oidc_enabled | default(false) }} security.oidc.clientId={{ clientId | default('') }} security.oidc.secret={{ secret | default('') }} security.oidc.discoveryUri={{ discoveryUri | default('') }} @@ -97,3 +99,9 @@ webservice.jwt_scopes={{ webservice_jwt_scopes | default('') }} userDetails.url={{ userdetails_url | default('https://auth.ala.org.au/userdetails/') }} +openapi.components.security.oauth2.authorizationUrl={{ auth_base_url }}/cas/oidc/authorize +openapi.components.security.oauth2.baseUrl={{ auth_base_url }}/cas/oidc +openapi.components.security.oauth2.refreshUrl={{ auth_base_url }}/cas/oidc/refresh +openapi.components.security.oauth2.tokenUrl={{ auth_base_url }}/cas/oidc/token +openapi.terms={{ terms_url | default('https://www.ala.org.au/terms-of-use/') }} +openapi.contact.email={{ orgSupportEmail | default('support@ala.org.au') }}