From aaf2611b82082245cfa715d9165ddbe0b63b5f10 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 28 Feb 2019 16:06:03 +0100
Subject: [PATCH] Adapt MariaDB config for 10.3.13

---
 mariadb/install.sh                      | 4 +---
 mariadb/install/srv/mariadb/conf/my.cnf | 2 +-
 mariadb/lxcfile                         | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mariadb/install.sh b/mariadb/install.sh
index b1796e4..76fe2f1 100755
--- a/mariadb/install.sh
+++ b/mariadb/install.sh
@@ -6,10 +6,8 @@ cd $(realpath $(dirname "${0}"))/install
 # Create MariaDB instance
 mkdir -p /srv/mariadb/conf /srv/mariadb/data
 chown 3306:3306 /srv/mariadb/data
-lxc-execute mariadb -- mysql_install_db --user=mysql --datadir=/var/lib/mysql --auth-root-authentication-method=socket --skip-test-db
-
-# Configure MariaDB
 cp srv/mariadb/conf/my.cnf /srv/mariadb/conf/my.cnf
+lxc-execute mariadb -- mysql_install_db --user=mysql --datadir=/var/lib/mysql --auth-root-authentication-method=socket --skip-test-db
 
 # Enable query logging. Only if the DEBUG environment variable is set
 if [ ${DEBUG:-0} -eq 1 ]; then
diff --git a/mariadb/install/srv/mariadb/conf/my.cnf b/mariadb/install/srv/mariadb/conf/my.cnf
index efc5e0b..5740333 100644
--- a/mariadb/install/srv/mariadb/conf/my.cnf
+++ b/mariadb/install/srv/mariadb/conf/my.cnf
@@ -12,7 +12,7 @@ myisam_sort_buffer_size = 8M
 
 [mysqldump]
 quick
-max_allowed_packet = 16M
+max_allowed_packet = 1M
 
 [mysql]
 no-auto-rehash
diff --git a/mariadb/lxcfile b/mariadb/lxcfile
index fd7d1db..bee3afd 100644
--- a/mariadb/lxcfile
+++ b/mariadb/lxcfile
@@ -15,7 +15,7 @@ RUN EOF
     chown mysql:mysql /run/mysqld
 EOF
 
-MOUNT DIR /srv/mariadb/conf etc/mysql
+MOUNT FILE /srv/mariadb/conf/my.cnf etc/my.cnf
 MOUNT DIR /srv/mariadb/data var/lib/mysql
 
 USER 3306 3306