You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/05/07 14:32:29 UTC

[syncope] 03/03: Ensure Audit works with MariaDB

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 1abd48dd193f6a4a788e6ae6fdc58da52698b97d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 7 16:31:17 2020 +0200

    Ensure Audit works with MariaDB
---
 .../src/main/resources/audit/audit_mariadb.sql     | 24 ++++++++++++++++++++++
 .../resources/mariadb/domains/Master.properties    |  4 ++--
 .../systemadministration/dbms.adoc                 |  1 +
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/core/persistence-jpa/src/main/resources/audit/audit_mariadb.sql b/core/persistence-jpa/src/main/resources/audit/audit_mariadb.sql
new file mode 100644
index 0000000..c6ee824
--- /dev/null
+++ b/core/persistence-jpa/src/main/resources/audit/audit_mariadb.sql
@@ -0,0 +1,24 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+CREATE TABLE IF NOT EXISTS SYNCOPEAUDIT (
+  EVENT_DATE TIMESTAMP,
+  LOGGER_LEVEL VARCHAR(255) NOT NULL,
+  LOGGER VARCHAR(255) NOT NULL,
+  MESSAGE LONGTEXT NOT NULL,
+  THROWABLE TEXT
+);
diff --git a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
index 7e745ce..0cff2c4 100644
--- a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 Master.driverClassName=org.mariadb.jdbc.Driver
-Master.url=jdbc:mariadb://localhost:3306/syncope?characterEncoding=UTF-8
+Master.url=jdbc:mariadb://${DB_CONTAINER_IP}:3306/syncope?characterEncoding=UTF-8
 Master.schema=
 Master.username=syncope
 Master.password=syncope
@@ -25,4 +25,4 @@ Master.orm=META-INF/spring-orm.xml
 Master.pool.maxActive=10
 Master.pool.minIdle=2
 
-Master.audit.sql=audit.sql
+Master.audit.sql=audit_mariadb.sql
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc
index cfb20eb..1548632 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc
@@ -319,6 +319,7 @@ Master.username=syncope
 Master.password=syncope
 Master.databasePlatform=org.apache.openjpa.jdbc.sql.MariaDBDictionary(blobTypeName=LONGBLOB,dateFractionDigits=3)
 Master.orm=META-INF/spring-orm.xml
+Master.audit.sql=audit_mariadb.sql
 ....
 
 [CAUTION]