Added extra variables in templates that still are using ALA default v…

…alues (#547) * Allow configuration of extra collectory variables * Allow configuration of extra biocache-hub variables * Allow configuration of extra regions variables * Allow configuration of extra bie-index variables * Allow configuration of extra lists variables * Allow configuration of extra DOI variables * Allow configuration of extra images variables * Allow configuration of extra alerts variables * Allow configuration of extra dashboard variables * Allow configuration of extra spatial variables * Allow configuration of extra logger variables * Allow configuration of extra sds variables * Allow configuration of extra userdetails variables * Added additional alerts variables * Fix typo in var * Missing configuration in logger * Added branding cors variable to setup cors in l-a branding only (#548) * Fix for broken cas contextPath on test For userdetails app * Revert 1865af * Add event fields to biocache facet list * SDS extra configuration (#550) * Extra SDS configuration variables * Restore tag * Added missing supportEmail. Fix for 551 (#552) * new ala-sensitive-data-service vars, more tags, and layers vars (#545) * Correct logger auth filter (#544) * Allow configuration of extra collectory variables * Allow configuration of extra biocache-hub variables * Allow configuration of extra regions variables * Allow configuration of extra bie-index variables * Allow configuration of extra lists variables * Allow configuration of extra DOI variables * Allow configuration of extra images variables * Allow configuration of extra alerts variables * Allow configuration of extra dashboard variables * Allow configuration of extra spatial variables * Allow configuration of extra logger variables * Allow configuration of extra sds variables * Allow configuration of extra userdetails variables * Added additional alerts variables * Fix typo in var * Missing configuration in logger Co-authored-by: Nick dos Remedios <[email protected]> Co-authored-by: Simon Bear <[email protected]> Co-authored-by: Adam Collins <[email protected]>
AtlasOfLivingAustralia · Mar 9, 2022 · 2cb2d01 · 2cb2d01
1 parent ec5c71c
commit 2cb2d01
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 4 deletions.
diff --git a/ansible/roles/alerts/templates/alerts-config.properties b/ansible/roles/alerts/templates/alerts-config.properties
@@ -35,6 +35,10 @@ dataSource.properties.validationQuery=SELECT 1
 
 # my annotation alert
 myannotation.enabled={{ enable_myannotation | default('false') }}
+useSpeciesLists: {{ enable_specieslists_alerts | default('true') }}
+useSpatial: {{ enable_spatial_alerts | default('true') }}
+useBlogsAlerts: {{ enable_blogs_alerts | default('true') }}
+useCitizenScienceAlerts: {{ enable_citizen_science_alerts | default('true') }}
 
 #External services
 biocache.baseURL={{ biocache_url | default('https://biocache.ala.org.au') }}
@@ -66,6 +70,7 @@ skin.orgNameShort={{ orgNameShort | default('Atlas') }}
 skin.orgSupportEmail={{ orgSupportEmail | default('[email protected]') }}
 siteDefaultLanguage={{ alerts_site_default_language | default('en') }}
 #skin.favicon={{ skin_favicon | default('https://www.ala.org.au/wp-content/themes/ala-wordpress-theme/img/favicon/favicon.ico') }}
+privacyPolicy={{ privacy_policy_url | default('https://www.ala.org.au/about/terms-of-use/privacy-policy/') }}
 
 # Example search labels and URLs
 occurrence.searchTitle={{ occurrence_searchTitle }}

diff --git a/ansible/roles/bie-index/templates/bie-index-config.yml b/ansible/roles/bie-index/templates/bie-index-config.yml
@@ -17,6 +17,8 @@ security:
     bypass:   {{ bypass_cas | default(true) }}
   apikey:
     serviceUrl: {{ auth_base_url }}/apikey/ws/check?apikey=
+userDetails:
+  url: {{ auth_base_url }}/userdetails/
 biocache:
   base: {{ biocache_base_url | default('https://biocache.ala.org.au') }}
   service: {{ biocache_service_url | default('https://biocache-ws.ala.org.au/ws') }}

diff --git a/ansible/roles/biocache-hub/templates/config/config.properties b/ansible/roles/biocache-hub/templates/config/config.properties
@@ -77,6 +77,7 @@ biocacheServicesUrl={{biocache_service_url}}
 biocache.downloads.extra={{biocache_downloads_extra | default('dataResourceUid,dataResourceName.p')}}
 biocache.ajax.useProxy={{biocache_ajax_useProxy | default('false')}}
 biocache.groupedFacetsUrl={{ biocache_grouped_facets_url | default('')}}
+biocache.indexedFieldsUrl={{biocache_service_url}}/index/fields
 collectory.baseUrl={{collectory_url}}
 collections.baseUrl={{collectory_url}}
 collectory.resources={{collectory_url}}/public/resources.json

diff --git a/ansible/roles/collectory/templates/config/collectory-config.properties b/ansible/roles/collectory/templates/config/collectory-config.properties
@@ -79,6 +79,7 @@ eml.city={{ eml_city | default('Canberra') }}
 eml.administrativeArea={{ eml_admin_area | default('ACT') }}
 eml.postalCode={{ eml_postal_code | default('2601') }}
 eml.country={{ eml_country | default('Australia') }}
+eml.electronicMailAddress = {{ eml_email_address | default('[email protected]') }}
 
 # The name displayed top left of header
 skin.homeUrl = {{ skin_home_url | default('http://www.ala.org.au') }}
@@ -112,6 +113,8 @@ alertsUrl={{ (alerts_url | default(alert_url)) | default('') }}
 alertUrl={{ (alerts_url | default(alert_url)) | default('') }}
 speciesListToolUrl={{ species_list_tool_url | default('https://lists.ala.org.au/speciesListItem/list/') }}
 userDetails.url = {{ auth_base_url }}/userdetails/
+skin.taxaLinks.baseUrl = {{ skin_taxa_links_base_url | default('https://bie.ala.org.au/species/') }}
+spatial.baseURL = {{ spatial_base_url | default('https://spatial.ala.org.au/') }}
 
 # GBIF base URL for webservices
 gbifApiUrl={{ gbif_api_url | default('https://api.gbif-uat.org/v1/') }}

diff --git a/ansible/roles/dashboard/templates/dashboard-config.properties b/ansible/roles/dashboard/templates/dashboard-config.properties
@@ -31,6 +31,7 @@ collectory.baseURL={{ collectory_base_url }}
 volunteer.baseURL={{ volunteer_base_url }}
 images.baseURL={{ images_base_url | default(image_service_base_url)}}
 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/')}}
 bhl.statsSelector={{ bhl_stats_selector | default('.onlinestats')}}
 headerAndFooter.baseURL={{ header_and_footer_baseurl | default('https://www.ala.org.au/commonui-bs3')}}
@@ -44,4 +45,5 @@ useVolunteerService={{ useVolunteerService | default('true') }}
 useCitizenScienceService={{ useCitizenScienceService | default('true') }}
 useBarcodeOfLifeService={{ useBarcodeOfLifeService | default('true') }}
 useNationalSpeciesListsService={{ useNationalSpeciesListsService | default('true') }}
-useBHLService={{ useBHLService | default('true') }}
+useBHLService={{ useBHLService | default('true') }}
+privacyPolicy={{ privacy_policy_url | default('https://www.ala.org.au/about/terms-of-use/privacy-policy/') }}
diff --git a/ansible/roles/doi-service/templates/doi-service-config.yml b/ansible/roles/doi-service/templates/doi-service-config.yml
@@ -107,3 +107,15 @@ collections:
 
 userDetails:
   url: {{ auth_base_url }}/userdetails/
+
+# swagger configuration
+swagger:
+  info:
+    description: "{{ doi_swagger_info_description | default('Generate DOIs for ALA applications') }}"
+    version: "{{ doi_swagger_info_version | default('1.0') }}"
+    title:  "{{ doi_swagger_info_title | default('ALA DOI service') }}"
+    termsOfServices: "{{ swagger_info_terms_of_services | default('https://www.ala.org.au/who-we-are/terms-of-use/') }}"
+    contact:
+      name:  "{{ swagger_contact_name | default('ALA Support') }}"
+      url: "{{ swagger_contact_url | default('https://www.ala.org.au') }}"
+      email: "{{ swagger_contact_email | default('[email protected]') }}"
diff --git a/ansible/roles/image-service/templates/config/image-service-config.yml b/ansible/roles/image-service/templates/config/image-service-config.yml
@@ -79,9 +79,9 @@ bie:
 # swagger configuration
 swagger:
   info:
-    description: "{{ swagger_info_description | default('API Documentation for Image Services') }}"
-    version: "{{ swagger_info_version | default('2.0') }}"
-    title:  "{{ swagger_info_title | default('Image Service API') }}"
+    description: "{{ images_swagger_info_description | default('API Documentation for Image Services') }}"
+    version: "{{ images_swagger_info_version | default('2.0') }}"
+    title:  "{{ images_swagger_info_title | default('Image Service API') }}"
     termsOfServices: "{{ swagger_info_terms_of_services | default('https://www.ala.org.au/who-we-are/terms-of-use/') }}"
     contact:
       name:  "{{ swagger_contact_name | default('ALA Support') }}"

diff --git a/ansible/roles/logger-service/templates/logger-config.properties b/ansible/roles/logger-service/templates/logger-config.properties
@@ -12,6 +12,7 @@ security.cas.authCookieName={{ auth_cookie_name | default('ALA-Auth') }}
 security.cas.uriFilterPattern={{ logger_uri_filter_pattern }}
 security.cas.uriExclusionFilterPattern=/images.*,/css.*,/js.*,/less.*
 security.cas.bypass={{ bypass_cas | default(false) }}
+userDetails.url = {{ auth_base_url }}/userdetails/
 
 # Legacy CAS properties
 casProperties=casServerLoginUrl,serverName,centralServer,casServerName,uriFilterPattern,uriExclusionFilter,authenticateOnlyIfLoggedInFilterPattern,casServerLoginUrlPrefix,gateway,casServerUrlPrefix,contextPath
@@ -47,6 +48,10 @@ headerAndFooter.version={{ header_and_footer_version | default('') }}
 ala.baseURL={{ ala_base_url | default('https://www.ala.org.au')}}
 bie.baseURL={{ bie_base_url | default('https://bie.ala.org.au')}}
 bie.searchPath={{ bie_search_path | default('/search') }}
+collectoryUrl={{ collectory_url | default('https://collections.ala.org.au') }}
 
 skin.layout={{ (logger_skin_layout | default(skin_layout)) | default('main') }}
 skin.orgNameLong={{ skin_orgNameLong | default('Atlas of Living Australia') }}
+skin.orgNameShort = {{ orgNameShort | default('ALA') }}
+skin.orgSupportEmail={{ orgSupportEmail | default('[email protected]') }}
+privacyPolicy={{ privacy_policy_url | default('https://www.ala.org.au/about/terms-of-use/privacy-policy/') }}
diff --git a/ansible/roles/regions/templates/regions-config.properties b/ansible/roles/regions/templates/regions-config.properties
@@ -39,6 +39,8 @@ biocache.occurrences.json=ws/occurrences/search.json
 skin.homeUrl={{ skin_home_url | default('https://www.ala.org.au') }}
 skin.favicon={{ skin_favicon | default('https://www.ala.org.au/app/uploads/2019/01/cropped-favicon-32x32.png') }}
 allowedHosts={{ spatial_ws_hostname | default('spatial.ala.org.au')  }}
+images.baseURL={{ image_service_url | default("https://images.ala.org.au") }}
+userDetails.url={{ auth_base_url }}/userdetails/
 
 ala.skin={{ skin_layout | default('main') }}
 skin.layout={{ (regions_skin_layout | default(skin_layout)) | default('main') }}

diff --git a/ansible/roles/sds/templates/sds-config.properties b/ansible/roles/sds/templates/sds-config.properties
@@ -15,6 +15,7 @@ security.cas.bypass=false
 {% if auth_cookie_name is defined %}
 security.cas.authCookieName={{ auth_cookie_name }}
 {% endif %}
+userDetails.url = {{ auth_base_url }}/userdetails/
 
 # Header and footer
 headerAndFooter.baseURL={{ header_and_footer_baseurl | default('https://www.ala.org.au/commonui-bs2')}}
@@ -29,6 +30,8 @@ sds.category.data={{ sds_url | default('https://sds.ala.org.au') }}/sensitivity-
 sds.zone.data={{ sds_url | default('https://sds.ala.org.au') }}/sensitivity-zones.xml
 layers.service.url={{ spatial_base_url | default('https://spatial.ala.org.au') }}/layers-service
 list.tool.url={{ specieslist_base_url | default('https://lists.ala.org.au') }}
+# Both list & lists are used
+lists.tool.url={{ specieslist_base_url | default('https://lists.ala.org.au') }}
 
 # Other options
 sdsFAQ.url={{ sds_faq_url | default('https://www.ala.org.au/faq/data-sensitivity/') }}

diff --git a/ansible/roles/spatial-hub/templates/spatial-hub-config.yml b/ansible/roles/spatial-hub/templates/spatial-hub-config.yml
@@ -45,6 +45,10 @@ bieService:
 userdetails:
     baseUrl: "{{ user_details_base_url | default('https://auth.ala.org.au/userdetails') }}"
 
+# ala-auth-plugin conf
+userDetails:
+    url: {{ auth_base_url }}/userdetails/
+
 favicon:
     url: "{{ favicon_url | default('https://www.ala.org.au/wp-content/themes/ala2011/images/favicon.ico') }}"
 

diff --git a/ansible/roles/species-list/templates/specieslist-webapp-config.properties b/ansible/roles/species-list/templates/specieslist-webapp-config.properties
@@ -21,6 +21,7 @@ grails.serverURL={{ specieslist_url }}
 #contextPath={{ specieslist_context_path }}
 
 userDetails.url={{ auth_base_url }}/userdetails/
+auth.userDetailsUrl={{ auth_base_url }}/userdetails/userDetails/
 security.apikey.check.serviceUrl={{ specieslist_apikey_check_url | default('https://auth.ala.org.au/apikey/ws/check?apikey=') }}
 
 # Data Source properties

diff --git a/ansible/roles/userdetails/templates/userdetails-config.yml b/ansible/roles/userdetails/templates/userdetails-config.yml
@@ -171,3 +171,4 @@ spring:
       nodes: {{ spring_session_redis_host }}:{{ spring_session_redis_port | default('6379') }}
 {% endif %}
 {% endif %}
+privacyPolicy:{{ privacy_policy_url | default('https://www.ala.org.au/about/terms-of-use/privacy-policy/') }}