Merge pull request #1786 from US-CBP/1.12_release

1.12 release
US-CBP · May 6, 2020 · 419ad13 · 419ad13
2 parents 0c73c0c + 8a5f66f
commit 419ad13
Show file tree

Hide file tree

Showing 37 changed files with 838 additions and 578 deletions.
diff --git a/1 b/1
diff --git a/docker-compose-original.yml b/docker-compose-original.yml
diff --git a/gtas-neo4j-etl/docker-compose.yml b/gtas-neo4j-etl/docker-compose.yml
diff --git a/gtas-neo4j-etl/pentaho.Dockerfile b/gtas-neo4j-etl/pentaho.Dockerfile
diff --git a/gtas-neo4j-scheduler/Dockerfile b/gtas-neo4j-scheduler/Dockerfile
diff --git a/gtas-parent/docker-resources/default.application.properties b/gtas-parent/docker-resources/default.application.properties
@@ -173,6 +173,8 @@ email.hit.notification.enabled=${AUTOMATED_HIT_NOTIFICATION_EMAIL_ENABLED}
 spring.mail.properties.ssl.trust.host=${SSL_TRUST_HOST}
 
 login.page.url=gtas.login.page.url
+login.max_allowed_attempts=5
+reset.link.url=https://${PROXY_IP}:8443/gtas/reset.html
 path-to-attachment=
 
 elastic.ssl.key=/usr/local/tomcat/conf/elasticsearch-node1.key