From 0406fe2f68cb31017c38df82e9628ba2c2726979 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 16 Oct 2024 13:26:13 +0200 Subject: [PATCH 1/4] New variables useful for the LA community --- ansible/roles/alerts/templates/alerts-config.properties | 2 +- .../roles/dashboard/templates/dashboard-config.properties | 5 +++++ ansible/roles/doi-service/templates/doi-service-config.yml | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ansible/roles/alerts/templates/alerts-config.properties b/ansible/roles/alerts/templates/alerts-config.properties index 9f644692c..bd764c67f 100644 --- a/ansible/roles/alerts/templates/alerts-config.properties +++ b/ansible/roles/alerts/templates/alerts-config.properties @@ -45,7 +45,7 @@ biocache.baseURL={{ biocache_url | default('https://biocache.ala.org.au') }} biocacheService.baseURL={{ biocache_service_url | default('https://biocache-ws.ala.org.au/ws') }} spatial.baseURL={{ spatial_url | default('https://spatial.ala.org.au') }} collectory.baseURL={{ collectory_url | default('https://collections.ala.org.au') }} -collectoryService.baseURL: {{ collectory_service_url | default('https://collections.ala.org.au') }} +collectoryService.baseURL: {{ alerts_collectory_service_url | default(collectory_service_url) | default('https://collections.ala.org.au') }} ala.userDetailsURL={{ alerts_userdetails_url | default(userdetails_url) | default('https://auth.ala.org.au/userdetails') }}/userDetails/getUserListFull lists.baseURL={{ lists_url | default('https://lists.ala.org.au') }} diff --git a/ansible/roles/dashboard/templates/dashboard-config.properties b/ansible/roles/dashboard/templates/dashboard-config.properties index c26b94e2c..fd6d70481 100644 --- a/ansible/roles/dashboard/templates/dashboard-config.properties +++ b/ansible/roles/dashboard/templates/dashboard-config.properties @@ -18,6 +18,7 @@ security.cas.bypass={{ bypass_cas | default(true) }} security.oidc.clientId={{ (dashboard_client_id | default(clientId)) | default('') }} security.oidc.secret={{ (dashboard_client_secret | default(secret)) | default('') }} security.oidc.discoveryUri={{ discoveryUri | default('') }} +security.oidc.discovery-uri={{ discoveryUri | default('') }} # cognito specific configs {% if auth_system is defined and auth_system == 'cognito' %} security.jwt.discoveryUri={{ discoveryUri | default('') }} @@ -40,13 +41,17 @@ security.cookie.domain={{auth_cookie_domain | default ('.ala.org.au')}} #################### # Dashboard Config # #################### +biocache.baseURL={{ dashboard_biocache_service_base_url | default('https://biocache-ws.ala.org.au/ws') }} biocache.webappURL={{ biocache_web_base_url | default('https://biocache.ala.org.au') }} ala.baseURL={{ ala_base_url | default('https://www.ala.org.au')}} +bie.baseURL={{ dashboard_bie_base_url | default('https://bie-ws.ala.org.au/ws') }} bie.webappURL={{ bie_web_base_url | default('https://bie.ala.org.au')}} bie.searchPath={{ bie_search_path | default('/search') }} spatial.baseURL={{ dashboard_spatial_base_url | default(spatial_base_url) }} +logger.baseURL={{ logger_base_url | default('https://logger.ala.org.au') }} collectory.baseURL={{ collectory_base_url }} volunteer.baseURL={{ volunteer_base_url }} +images.baseURL={{ images_base_url | default('https://images.ala.org.au') }} userDetails.baseURL={{ (dashboard_userdetails_base_url | default(userdetails_base_url)) | default('https://auth.ala.org.au/userdetails') }} userDetails.url={{ (dashboard_userdetails_base_url | default(userdetails_base_url)) | default('https://auth.ala.org.au/userdetails') }}/ bhl.baseURL={{ bhl_base_url | default('http://biodiversitylibrary.org/')}} diff --git a/ansible/roles/doi-service/templates/doi-service-config.yml b/ansible/roles/doi-service/templates/doi-service-config.yml index 2a75b51df..1c5a4ff65 100644 --- a/ansible/roles/doi-service/templates/doi-service-config.yml +++ b/ansible/roles/doi-service/templates/doi-service-config.yml @@ -37,7 +37,7 @@ security: {% endif %} jwt: discoveryUri: {{ discoveryUri | default('') }} - clientId: {{ clientId | default('') }} + clientId: {{ doi_client_id | default(clientId) | default('') }} # cognito specific configs {% if auth_system is defined and auth_system == 'cognito' %} rolesFromAccessToken: {{ rolesFromAccessToken | default('true') }} @@ -45,7 +45,7 @@ security: roleClaims: {{ roleClaims | default('') }} {% endif %} apiKey: - enabled: {{ apikey_check_enabled | default('false') }} + enabled: {{ doi_apikey_check_enabled | default(apikey_check_enabled) | default('false') }} auth: serviceUrl: {{ apikey_auth_url }} check: From a77884b70b3efb151ee4809f67e386d1e5f8b42d Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 17 Oct 2024 10:26:44 +0200 Subject: [PATCH 2/4] Add serviceUrl var --- ansible/roles/bie-index/templates/bie-index-config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/roles/bie-index/templates/bie-index-config.yml b/ansible/roles/bie-index/templates/bie-index-config.yml index e24088736..50e9ebdd2 100644 --- a/ansible/roles/bie-index/templates/bie-index-config.yml +++ b/ansible/roles/bie-index/templates/bie-index-config.yml @@ -55,6 +55,8 @@ security: serviceUrl: {{ apikey_check_url | default('https://auth.ala.org.au/apikey/ws/check?apikey=') }} userdetails: serviceUrl: {{ apikey_userdetails_url }} + # still present in alaAdmin/viewConfig so let's configure properly + serviceUrl: {{ apikey_auth_url }} webservice: jwt: {{ webservice_jwt | default('false') }} jwt-scopes: {{ bie_index_webservice_jwt_scopes | default(webservice_jwt_scopes) | default('') }} From f08ee7328de9854aab7ac627d90e1286edadbb83 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 17 Oct 2024 11:57:58 +0200 Subject: [PATCH 3/4] bie_hub_collectory_service_url because is different than in bie_index --- ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 b/ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 index 06e43618d..8c9953866 100644 --- a/ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 +++ b/ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 @@ -133,7 +133,7 @@ collectory: baseURL: {{ collectory_url }} threatenedSpeciesCodesUrl: {{ collectory_url }}/public/showDataResource collectoryService: - baseURL: {{ collectory_service_url | default(collectory_url) }} + baseURL: {{ bie_hub_collectory_service_url | defaul(collectory_service_url) | default(collectory_url) }} speciesList: baseURL: {{ species_list_url }} preferredSpeciesListDruid: {{ specieslist_preferredDruid }} From 7b30cf3f6ed0afdbd17c774f1ef9dfbdd9d42369 Mon Sep 17 00:00:00 2001 From: vjrj Date: Mon, 21 Oct 2024 12:48:50 +0200 Subject: [PATCH 4/4] Fix typo --- ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 b/ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 index 8c9953866..dcd2c01fd 100644 --- a/ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 +++ b/ansible/roles/bie-hub/templates/bie-hub-config.yml.j2 @@ -133,7 +133,7 @@ collectory: baseURL: {{ collectory_url }} threatenedSpeciesCodesUrl: {{ collectory_url }}/public/showDataResource collectoryService: - baseURL: {{ bie_hub_collectory_service_url | defaul(collectory_service_url) | default(collectory_url) }} + baseURL: {{ bie_hub_collectory_service_url | default(collectory_service_url) | default(collectory_url) }} speciesList: baseURL: {{ species_list_url }} preferredSpeciesListDruid: {{ specieslist_preferredDruid }}