Skip to content

Commit

Permalink
Merge pull request #728 from AtlasOfLivingAustralia/dev
Browse files Browse the repository at this point in the history
Preparing v3.3
  • Loading branch information
chrisala authored Feb 7, 2022
2 parents 8ccb8bc + 3be867e commit 9ae4f1d
Show file tree
Hide file tree
Showing 92 changed files with 3,416 additions and 451 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ before_install:
- export TZ=Australia/Canberra
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.12.0-amd64.deb -o elasticsearch.deb
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.16.3-amd64.deb -o elasticsearch.deb
- sudo dpkg -i --force-confnew elasticsearch.deb
- sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch
- sudo service elasticsearch restart
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ environments {
This configuration file largely specifies URLs to ecodata dependencies. See https://github.com/AtlasOfLivingAustralia/ecodata/wiki/Ecodata-Dependencies for information about these.
Note that you will need to obtain an ALA API key to use ALA services and a Google Maps API key and specify them in this file.

#### Elasticsearch configuration
Elasticsearch requires an additional configuration item in elasticsearch.yml
```indices.query.bool.max_clause_count: 8192```

### Testing
* To run the grails unit tests, use:
```
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
id 'com.craigburke.client-dependencies' version '1.4.0'
}

version "3.2.2"
version "3.3-SNAPSHOT"
group "au.org.ala"
description "Ecodata"

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ gormVersion=7.0.2
grailsWrapperVersion=1.0.0
gradleWrapperVersion=5.0
assetPipelineVersion=3.2.4
elasticsearchVersion=7.15.0
elasticsearchVersion=7.15.2
mongoDBVersion=7.0
geoToolsVersion=11.2
org.gradle.jvmargs=-Xss2048k -Xmx1024M
Expand Down
2 changes: 1 addition & 1 deletion gradle/clover.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ clover {
xml = true
}

targetPercentage = '40.5%'
targetPercentage = '43.7%'
}
37 changes: 32 additions & 5 deletions grails-app/conf/application.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,21 @@ grails.cache.config = {
}
}


security {
cas {
appServerName = 'http://devt.ala.org.au:8080' // or similar, up to the request path part
// service = 'http://devt.ala.org.au:8080' // optional, if set it will always be used as the return path from CAS
casServerUrlPrefix = 'https://auth.ala.org.au/cas'
loginUrl = 'https://auth.ala.org.au/cas/login'
logoutUrl = 'https://auth.ala.org.au/cas/logout'
casServerName = 'https://auth.ala.org.au'
uriFilterPattern = ['/admin/*', '/activityForm/*']
authenticateOnlyIfLoggedInPattern =
uriExclusionFilterPattern = ['/assets/.*','/images/.*','/css/.*','/js/.*','/less/.*', '/activityForm/get.*']
}
}

environments {
development {
grails.logging.jul.usebridge = true
Expand All @@ -585,7 +600,7 @@ environments {
app.elasticsearch.indexAllOnStartup = false
app.elasticsearch.indexOnGormEvents = true
grails.serverURL = "http://devt.ala.org.au:8080"
app.uploads.url = "${grails.serverURL}/document/download?filename="
app.uploads.url = "/document/download/"
grails.mail.host="localhost"
grails.mail.port=1025
temp.dir="/data/ecodata/tmp"
Expand Down Expand Up @@ -638,14 +653,26 @@ environments {
app.elasticsearch.indexAllOnStartup = true
app.file.upload.path = "./build/uploads"
app.file.archive.path = "./build/archive"
String casBaseUrl = "http://localhost:8018"
userDetails {
url = "${casBaseUrl}/userdetails/"
}

wiremock.port = 8018
def casBaseUrl = "http://devt.ala.org.au:${wiremock.port}"
security.cas.casServerName="${casBaseUrl}"
security.cas.contextPath=""
security.cas.casServerUrlPrefix="${casBaseUrl}/cas"
security.cas.loginUrl="${security.cas.casServerUrlPrefix}/login"
security.cas.casLoginUrl="${security.cas.casServerUrlPrefix}/login"

userDetails.url = "${casBaseUrl}/userdetails/"
userDetails.admin.url = "${casBaseUrl}/userdetails/ws/admin"
authGetKeyUrl = "${casBaseUrl}/mobileauth/mobileKey/generateKey"
authCheckKeyUrl = "${casBaseUrl}/mobileauth/mobileKey/checkKey"
security.apikey.serviceUrl = "${casBaseUrl}/apikey/ws/check?apikey="

grails.mail.host = 'localhost'
grails.mail.port = 3025 // com.icegreen.greenmail.util.ServerSetupTest.SMTP.port
// Schedule the audit thread frequently during functional tests to get less indexing errors because
// the data was cleaned up before the audit ran
audit.thread.schedule.interval = 500l;
}
production {
grails.logging.jul.usebridge = false
Expand Down
22 changes: 0 additions & 22 deletions grails-app/conf/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,30 +165,8 @@ cors:

---

security:
cas:
appServerName: 'http://devt.ala.org.au:8080'
casServerName: 'https://auth.ala.org.au'
casServerUrlPrefix: 'https://auth.ala.org.au/cas'
loginUrl: 'https://auth.ala.org.au/cas/login'
logoutUrl: 'https://auth.ala.org.au/cas/logout'
uriFilterPattern:
- '/admin/*'
- '/activityForm/*'
authenticateOnlyIfLoggedInPattern:
uriExclusionFilterPattern:
- '/images/.*'
- '/css/.*'
- '/js/.*'
- '/less/.*'
- '/assets/.*'
- '/activityForm/get.*'

#Fix grails taglib <g:paginate/> to work with bootstrap css.
grails:
plugins:
twitterbootstrap:
fixtaglib: true
mail:
default:
from: [email protected]
Expand Down
Loading

0 comments on commit 9ae4f1d

Please sign in to comment.