Skip to content

Commit fae41b2

Browse files
author
Adam Collins
committed
fieldguide
1 parent 90a29b5 commit fae41b2

File tree

5 files changed

+88
-11
lines changed

5 files changed

+88
-11
lines changed

ansible/fieldguide.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
roles:
33
- common
44
- java
5-
- tomcat
65
- webserver
6+
- tomcat
77
- fieldguide
8-
- wkhtmltopdf

ansible/inventories/vagrant/fieldguide-vagrant

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,21 @@ is_vagrant=true
66
local_repo_dir=~/.ala
77
data_dir=/data
88

9+
use_openjdk8=False
10+
use_openjdk11=True
11+
912
fieldguide_hostname=fieldguide.vagrant1.ala.org.au
1013
fieldguide_url=http://fieldguide.vagrant1.ala.org.au
1114
fieldguide_base_url=http://fieldguide.vagrant1.ala.org.au
1215
fieldguide_context_path=
1316

14-
wkhtmltopdf_path=/usr/local/bin/wkhtmltopdf
1517
fieldguide_url={{fieldguide_base_url}}
1618
fieldguide_store=/data/fieldguide/store
1719
biocache_service_ws_url=http://biocache.vagrant1.ala.org.au/ws
1820
bie_service_ws_url=http://bie.vagrant1.ala.org.au/ws
1921

2022
auth_base_url=https://auth.ala.org.au
2123
auth_cas_url=https://auth.ala.org.au/cas
24+
25+
oidc_client_id=change me
26+
oidc_secret=change me

ansible/roles/fieldguide/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@
5050
- properties
5151

5252
- name: copy all config.properties
53-
template: src=fieldguide-config.properties dest={{data_dir}}/{{fieldguide_app}}/config/{{fieldguide_app}}-config.properties
53+
template: src=fieldguide-config.yml dest={{data_dir}}/{{fieldguide_app}}/config/{{fieldguide_app}}-config.yml
5454
tags:
5555
- fieldguide
5656
- properties
5757

5858
- name: set data ownership
5959
file: path={{data_dir}}/{{fieldguide_app}} owner={{tomcat_user}} group={{tomcat_user}} recurse=true
60-
notify:
60+
notify:
6161
- restart tomcat
6262
tags:
6363
- fieldguide

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

-6
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
service:
2+
bie.ws.url: {{bie_service_ws_url}}
3+
biocache.ws.url: {{biocache_service_ws_url}}
4+
5+
collections.url: {{collectory_base_url|default('https://collections.ala.org.au')}}
6+
image.ws.url: {{images_service_base_url|default('https://images.ala.org.au/ws')}}
7+
8+
fieldguide:
9+
url: {{fieldguide_base_url}}
10+
store: {{fieldguide_store|default('/data/fieldguide/store')}}
11+
12+
threadPoolSize: 4
13+
14+
email:
15+
enabled: true
16+
from: "support@ala.org.au"
17+
text:
18+
success: "Your download is available on the URL:
19+
<br><br>[url]<br><br>When using this field guide please use the following citation:
20+
<br><br><cite>Atlas of Living Australia field guide generated from [query] accessed on [date].
21+
</cite><br><br>More information can be found at
22+
<a href='http://www.ala.org.au/about-the-atlas/terms-of-use/citing-the-atlas/'>citing the ALA</a>.<br><br>"
23+
subject:
24+
success: "ALA Field Guide Download Complete - [filename]"
25+
26+
27+
# validate email addresses against registered users
28+
validateEmail: true
29+
30+
# NOTE: add the server IP to userdetails authorised systems
31+
userDetails:
32+
url: {{auth_base_url}}/userdetails/
33+
34+
#
35+
# CAS SETTINGS
36+
#
37+
# NOTE: Some of these will be ignored if default_config exists
38+
security:
39+
cas:
40+
casServerName: {{auth_base_url}}
41+
loginUrl: {{auth_cas_url}}/login
42+
logoutUrl: {{auth_cas_url}}/logout
43+
casServerUrlPrefix: {{auth_base_url}}/cas
44+
bypass: false # set to true for non-ALA deployment
45+
gateway: false
46+
uriExclusionFilterPattern: []
47+
uriFilterPattern: []
48+
#if false, ticket params always proceed
49+
#true, only processes urls listed in authenticateOnlyIfLoggedInFilterPattern
50+
applyUriFiltersToTicketValidation: false
51+
authenticateOnlyIfCookieFilterPattern: ['/', '/*']
52+
disableCAS: true
53+
ignoreCase: true
54+
authCookieName: ALA-Auth
55+
enabled: false
56+
oidc:
57+
enabled: true
58+
discovery-uri: {{auth_cas_url}}/oidc/.well-known
59+
clientId: {{oidc_client_id}}
60+
secret: {{oidc_secret}}
61+
allowUnsignedIdTokens: true
62+
scope: 'openid email ala'
63+
jwt:
64+
enabled: true
65+
discoveryUri: {{auth_cas_url}}/oidc/.well-known
66+
fallbackToLegacyBehaviour: true
67+
68+
openapi:
69+
title: Fieldguide REST services
70+
description: REST services for interacting with the fieldguide webapp
71+
terms: https://www.ala.org.au/terms
72+
contact:
73+
name: Support
74+
email: support@ala.org.au
75+
license:
76+
name: Mozilla Public License 1.1
77+
url: https://www.mozilla.org/en-US/MPL/1.1/
78+
version: '@info.app.version@'
79+
cachetimeoutms: 4000

0 commit comments

Comments
 (0)