aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
Diffstat (limited to 'id/server')
-rw-r--r--id/server/data/deploy/conf/moa-id/moa-id.properties18
-rw-r--r--id/server/doc/handbook/config/config.html31
2 files changed, 41 insertions, 8 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 8418f00cb..41ca6c008 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -68,7 +68,7 @@ protocols.oauth20.jwt.ks.key.password=password
##Database configuration##
#Hibnerate configuration for MOA-ID 3.x session store
moasession.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-moasession.hibernate.connection.url=jdbc:mysql://localhost/moa-id-session?charSet=utf-8
+moasession.hibernate.connection.url=jdbc:mysql://localhost/moa-id-session?charSet=utf-8&serverTimezone=UTC
moasession.hibernate.connection.charSet=utf-8
moasession.hibernate.connection.driver_class=com.mysql.jdbc.Driver
moasession.hibernate.connection.username=
@@ -81,9 +81,10 @@ moasession.hibernate.transaction.auto_close_session=true
moasession.hibernate.show_sql=false
moasession.hibernate.format_sql=true
+moasession.jpaVendorAdapter.generateDdl=true
moasession.dbcp.connectionProperties=
moasession.dbcp.initialSize=5
-moasession.dbcp.maxActive=20
+moasession.dbcp.maxActive=100
moasession.dbcp.maxIdle=8
moasession.dbcp.minIdle=5
moasession.dbcp.maxWaitMillis=-1
@@ -91,7 +92,7 @@ moasession.dbcp.testOnBorrow=true
moasession.dbcp.testOnReturn=false
moasession.dbcp.testWhileIdle=false
moasession.dbcp.validationQuery=select 1
-moasession.jpaVendorAdapter.generateDdl=true
+
#Hibnerate configuration for MOA-ID 3.x configuration
@@ -99,7 +100,7 @@ configuration.hibernate.dialect=org.hibernate.dialect.MySQLDialect
configuration.jpaVendorAdapter.generateDdl=true
configuration.hibernate.show_sql=false
-configuration.hibernate.connection.url=jdbc:mysql://localhost/moa-id-config?charSet=utf-8&autoReconnect=true
+configuration.hibernate.connection.url=jdbc:mysql://localhost/moa-id-config?charSet=utf-8&autoReconnect=true&serverTimezone=UTC
configuration.hibernate.connection.charSet=utf-8
configuration.hibernate.connection.driver_class=com.mysql.jdbc.Driver
configuration.hibernate.connection.username=
@@ -107,7 +108,7 @@ configuration.hibernate.connection.password=
configuration.dbcp.connectionProperties=
configuration.dbcp.initialSize=0
-configuration.dbcp.maxActive=8
+configuration.dbcp.maxActive=100
configuration.dbcp.maxIdle=8
configuration.dbcp.minIdle=0
configuration.dbcp.maxWaitMillis=-1
@@ -119,7 +120,7 @@ configuration.dbcp.validationQuery=SELECT 1
#
#Hibnerate configuration for MOA-ID 3.x advanced statistic logging
advancedlogging.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-advancedlogging.hibernate.connection.url=jdbc:mysql://localhost/moa-id-statistic?charSet=utf-8&autoReconnect=true
+advancedlogging.hibernate.connection.url=jdbc:mysql://localhost/moa-id-statistic?charSet=utf-8&autoReconnect=true&serverTimezone=UTC
advancedlogging.hibernate.connection.charSet=utf-8
advancedlogging.hibernate.connection.driver_class=com.mysql.jdbc.Driver
advancedlogging.hibernate.connection.username=
@@ -132,9 +133,10 @@ advancedlogging.hibernate.show_sql=false
advancedlogging.hibernate.format_sql=true
advancedlogging.hibernate.transaction.flush_before_completion=true
+advancedlogging.jpaVendorAdapter.generateDdl=true
advancedlogging.dbcp.connectionProperties=
advancedlogging.dbcp.initialSize=3
-advancedlogging.dbcp.maxActive=20
+advancedlogging.dbcp.maxActive=50
advancedlogging.dbcp.maxIdle=8
advancedlogging.dbcp.minIdle=3
advancedlogging.dbcp.maxWaitMillis=-1
@@ -142,7 +144,7 @@ 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.
diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html
index 9dc2052ae..1e1a7d398 100644
--- a/id/server/doc/handbook/config/config.html
+++ b/id/server/doc/handbook/config/config.html
@@ -673,6 +673,37 @@ https://&lt;host&gt;:&lt;port&gt;/moa-id-auth/MonitoringServlet</pre>
<td>Passwort f&uuml;r den Zugriff auf das Datenbank Schema</td>
</tr>
</table>
+<p>&nbsp;</p>
+<p><strong>Hinweis:</strong> Zus&auml;tzlich zum SQL based Datenbank Backend f&uuml;r Sessiondaten gibt es aber der Version 3.2.0 die M&ouml;glichkeit einen Redis Datenserver als Datenbank Backend f&uuml;r Kurzzeitsessiondaten zu verwenden. Wird dieser aktiviert werden nur mehr Single Sign-On Sessioninformationen in der Sessiondatenbank abgelegt. Alle anderen Prozessdaten werden ausschlie&szlig;lich &uuml;ber das Redis Backend abgewickelt.</p>
+<table class="configtable">
+ <tr>
+ <th>Name</th>
+ <th>Beispielwert</th>
+ <th>Beschreibung</th>
+ </tr>
+ <tr>
+ <td>redis.active</td>
+ <td><p>true / false</p></td>
+ <td>Aktiviert das Redis Backend f&uuml;r Kurzzeitsessiondaten</td>
+ </tr>
+ <tr>
+ <td>redis.use-pool</td>
+ <td>true / false</td>
+ <td>Aktiviert / Deaktiviert den Connectionpool f&uuml;r Redis</td>
+ </tr>
+ <tr>
+ <td><p>redis.host-name</p></td>
+ <td>localhost</td>
+ <td>URL unter der der Redis Server erreichbar ist</td>
+ </tr>
+ <tr>
+ <td><p>redis.port</p></td>
+ <td>6379</td>
+ <td>Port unter dem der Redis Server erreichbar ist</td>
+ </tr>
+</table>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
<h6><a name="basisconfig_moa_id_auth_param_database_info" id="uebersicht_bekanntmachung14"></a>2.2.2.4.3 Statistikdaten</h6>
<p>Alle Parameter aus der Basiskonfiguration welche als Prefix <em>advancedlogging.hibernate</em>. im Parameternamen aufweisen konfigurieren den Zugriff auf das Datenbank Schema welches die Konfiguration von MOA-ID-Auth beinhaltet. Eine Konfiguration dieser Parameter ist nur erforderlich wenn <em>configuration.advancedlogging.active</em> auf <em>true</em> gesetzt wird. (siehe <a href="#basisconfig_moa_id_auth_param_general">Kapitel 2.2.2.1</a>)</p>
<table class="configtable">