Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New variables for the LA community #855

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

New variables for the LA community #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0406fe2
New variables useful for the LA community
vjrj Oct 16, 2024
a77884b
Add serviceUrl var
vjrj Oct 17, 2024
f08ee73
bie_hub_collectory_service_url because is different than in bie_index
vjrj Oct 17, 2024
7b30cf3
Fix typo
vjrj Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/alerts/templates/alerts-config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}

Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/bie-hub/templates/bie-hub-config.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | default(collectory_service_url) | default(collectory_url) }}
speciesList:
baseURL: {{ species_list_url }}
preferredSpeciesListDruid: {{ specieslist_preferredDruid }}
Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/bie-index/templates/bie-index-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('') }}
Expand Down
5 changes: 5 additions & 0 deletions ansible/roles/dashboard/templates/dashboard-config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('') }}
Expand All @@ -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/')}}
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/doi-service/templates/doi-service-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ 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') }}
userIdClaim: {{ userIdClaim | default('') }}
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:
Expand Down