Update biocollect and ecodata roles for the LA community (#562)

ansible/ecodata.yml

@@ -1,4 +1,4 @@
-- hosts: all
+- hosts: ecodata,ecodata-reporting,primary,secondary
   vars:
     tomcat: "tomcat7"
     tomcat_user: "tomcat7"

ansible/roles/apikey/tasks/main.yml

@@ -115,6 +115,7 @@
     - { app: "specieslists", apikey: "{{ speciesList_api_key }}" }
     - { app: "pipelines", apikey: "{{ pipelines_api_key | default('') }}" }
     - { app: "data-quality", apikey: "{{ data_quality_api_key | default('') }}" }
+    - { app: "ecodata", apikey: "{{ ecodata_api_key | default('') }}" }
   loop_control:
     loop_var: oitem
   when: apikey_def_creator_email is defined and apikey_def_creator_userid is defined and oitem.apikey|length > 0

ansible/roles/biocollect/tasks/main.yml

@@ -2,14 +2,15 @@
   tags:
     - deploy
     - biocollect
+    - properties
 
 - name: set biocollect_user as default value
   set_fact:
     biocollect_user: "{{ (exec_jar) | ternary ('biocollect', 'tomcat')}}"
   tags:
     - biocollect
     - deploy
-
+    - properties
 
 - name: add jar and service
   include_role:
@@ -123,7 +124,7 @@
       - path: "{{ biocollect_context_path | default('/') }}"
         is_proxy: true
         sort_label: "tomcatproxy"
-        proxy_pass: "http://127.0.0.1:8080"
+        proxy_pass: "http://127.0.0.1:{{ biocollect_server_port }}"
   tags:
     - nginx_vhost
     - deploy

ansible/roles/biocollect/templates/biocollect-config.properties

@@ -17,7 +17,7 @@ server.port={{ biocollect_tomcat_server_port | default ('8080', True) }}
 
 enableReporting = true
 app.default.hub=ala
-biocollect.homepageUrl={{ biocollect_homepage_url }}
+biocollect.homepageUrl={{ biocollect_homepage_url | default ('') }}
 
 ecodata.baseURL={{ ecodata_base_url }}
 ecodata.baseUrl={{ ecodata_base_url }}
@@ -32,20 +32,21 @@ upload.images.url={{ biocollect_base_url }}/image?id=
 # Add no cache headers to pages generated by controllers
 app.view.nocache = true
 
-
 # Spatial portal config
 spatial.baseUrl={{ spatial_base_url }}
 
 ala.image.service.url={{ images_base_url | default('http://images-dev.ala.org.au/') }}
+images.baseURL={{ image_service_url | default("https://images.ala.org.au") }}
+
+collectory.service.url={{ collectory_url | default('https://collections.ala.org.au') }}
 
 # Mail config
 grails.mail.host={{ mail_host | default('act-ironport-int.csiro.au') }}
 grails.mail.port={{ mail_port | default('25') }}
 emailFilter={{ mail_filter | default('/[A-Z0-9._%-]+@csiro\.au|chris\.godwin\[email protected]|[email protected]/') }}
 biocollect.support.email.address = {{ biocollect_support_email }}
-biocollect.system.email.replyTo = biocollect-{{ (deployment_env == 'prod') | ternary('', deployment_env) }}<no-reply>@ala.org.au
-biocollect.system.email.sender = biocollect-({{ (deployment_env == 'prod') | ternary('', deployment_env) }})@ala.org.au
-
+biocollect.system.email.replyTo = {{ noreply_email | default( 'biocollect-' + (deployment_env == 'prod') | ternary('', deployment_env) + '<no-reply>@ala.org.au' ) }}
+biocollect.system.email.sender = {{ email_sender | default( 'biocollect-' + (deployment_env == 'prod') | ternary('', deployment_env) + '@ala.org.au' ) }}
 
 # Sighting Plugin specific properties
 spatial.baseURL={{ spatial_base_url }}

ansible/roles/ecodata/tasks/main.yml

@@ -2,13 +2,15 @@
   tags:
     - ecodata
     - deploy
+    - properties
 
 - name: set ecodata_user as default value
   set_fact:
     ecodata_user: "{{ (exec_jar) | ternary ('ecodata', 'tomcat7')}}"
   tags:
     - ecodata
     - deploy
+    - properties
 
 #
 # External configuration directories and files

ansible/roles/ecodata/templates/ecodata-config.properties

@@ -4,6 +4,15 @@ server.port={{ ecodata_tomcat_server_port | default ('8080', True) }}
 
 gateway=false
 security.cas.appServerName={{ecodata_url}}
+security.cas.casServerName={{ auth_base_url }}
+security.cas.casServerLoginUrl={{ auth_base_url }}/cas/login
+security.cas.casServerUrlPrefix={{ auth_base_url }}/cas
+security.cas.logoutUrl={{ auth_base_url }}/cas/logout
+security.cas.loginUrl={{ auth_base_url }}/cas/login
+userDetailsSingleUrl = {{ auth_base_url }}/userdetails/userDetails/getUserDetails
+userDetailsUrl = {{ auth_base_url }}/userdetails/userDetails/getUserListFull
+userDetails.admin.url = {{ auth_base_url }}/userdetails/ws/admin
+
 app.api.whiteList={{ app_api_whiteList | default('') }}
 imagesService.baseURL={{ imagesService_baseURL }}
 biocacheService.baseURL={{ biocacheService_baseUrl }}
@@ -25,12 +34,13 @@ grails.mail.host={{ mail_host | default('localhost') }}
 grails.mail.port={{ mail_port | default('25') }}
 emailFilter={{ mail_filter | default('') }}
 ecodata.support.email.address = {{ ecodata_support_email }}
-ecodata.system.email.replyTo = ALA-{{ deployment_env == 'prod' | ternary('', deployment_env) }}<no-reply>@ala.org.au>
-ecodata.system.email.sender = ALA({{ deployment_env == 'prod' | ternary('', deployment_env) }})@ala.org.au
+ecodata.system.email.replyTo = {{ noreply_email | default( 'ALA-' + (deployment_env == 'prod') | ternary('', deployment_env) + '<no-reply>@ala.org.au' ) }}
+ecodata.system.email.sender = {{ email_sender | default( 'ALA-' + (deployment_env == 'prod') | ternary('', deployment_env) + '@ala.org.au' ) }}
 
 # URL to use to download asynchronously produced files
 async.download.url.prefix={{ biocollect_base_url }}/
 
+biocollect.baseURL = {{ biocollect_base_url }}
 # Biocollect Project Url for species alert
 biocollect.project.url = {{ biocollect_base_url }}/project/index/
 biocollect.activity.url = {{ biocollect_base_url }}/bioActivity/index/
@@ -75,3 +85,5 @@ elasticsearch.primary = {{ elasticsearch_primary_server }}
 elasticsearch.username = {{ es_api_basic_auth_username }}
 elasticsearch.password = {{ es_api_basic_auth_password }}
 
+ala.baseURL={{ ala_base_url | default('https://www.ala.org.au')}}
+headerAndFooter.baseURL={{ header_and_footer_baseurl | default('https://www.ala.org.au/commonui-bs3')}}