aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy/conf
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-07-01 09:21:52 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-07-01 09:21:52 +0200
commit66d6cafeea8f1175bbec47bf29abb6933d38d52d (patch)
tree583f9f56bf173e420e18a7819ed847bbc0c632d3 /id/server/data/deploy/conf
parent9ea8151676f2c49ef25f4604876a43ac5fd6c045 (diff)
parent0b49f1e9e6ee7651758a961438d626b187766f4f (diff)
downloadmoa-id-spss-66d6cafeea8f1175bbec47bf29abb6933d38d52d.tar.gz
moa-id-spss-66d6cafeea8f1175bbec47bf29abb6933d38d52d.tar.bz2
moa-id-spss-66d6cafeea8f1175bbec47bf29abb6933d38d52d.zip
Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation
Diffstat (limited to 'id/server/data/deploy/conf')
-rw-r--r--id/server/data/deploy/conf/moa-id/moa-id.properties17
1 files changed, 15 insertions, 2 deletions
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index 5e8bfa567..554d0b522 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -129,7 +129,19 @@ advancedlogging.hibernate.current_session_context_class=thread
advancedlogging.hibernate.transaction.auto_close_session=true
advancedlogging.hibernate.show_sql=false
advancedlogging.hibernate.format_sql=true
-
+advancedlogging.hibernate.transaction.flush_before_completion=true
+
+advancedlogging.dbcp.connectionProperties=
+advancedlogging.dbcp.initialSize=3
+advancedlogging.dbcp.maxActive=20
+advancedlogging.dbcp.maxIdle=8
+advancedlogging.dbcp.minIdle=3
+advancedlogging.dbcp.maxWaitMillis=-1
+advancedlogging.dbcp.testOnBorrow=true
+advancedlogging.dbcp.testOnReturn=false
+advancedlogging.dbcp.testWhileIdle=false
+advancedlogging.dbcp.validationQuery=select 1
+advancedlogging.jpaVendorAdapter.generateDdl=true
################ Additonal eID-modul configuration ####################################
## This additional eID moduls add special functionality to MOA-ID-Auth.
@@ -166,7 +178,8 @@ modules.federatedAuth.response.encryption.alias=pvp_assertion
modules.federatedAuth.response.encryption.password=password
#Redis Settings, if Redis is used as a backend for session data.
-#has to be enabled with a start parameter for tomcat -Dspring.profiles.active=redis
+#has to be enabled with the following parameter
+#redis.active=true
redis.use-pool=true
redis.host-name=localhost
redis.port=6379