From 1737c50ad4e10fd2813e6f91bcfab7f494b0e84e Mon Sep 17 00:00:00 2001
From: "root (fetsite21)" <admin@fet.at>
Date: Sun, 10 Jan 2021 08:23:05 +0100
Subject: [PATCH] fixes for deployment

---
 deployment/mysql.cnf | 11 +++++++++++
 docker-compose.yml   | 13 +++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 deployment/mysql.cnf

diff --git a/deployment/mysql.cnf b/deployment/mysql.cnf
new file mode 100644
index 00000000..b3e857e2
--- /dev/null
+++ b/deployment/mysql.cnf
@@ -0,0 +1,11 @@
+[client]
+default-character-set=utf8mb4
+
+[mysql]
+default-character-set=utf8mb4
+
+
+[mysqld]
+collation-server = utf8mb4_unicode_ci
+init-connect='SET NAMES utf8'
+character-set-server = utf8mb4
diff --git a/docker-compose.yml b/docker-compose.yml
index 76312ee4..9ecf9727 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,25 +9,25 @@ services:
     volumes:
       - /mnt/fotos/www:/app/data
   mysql:
-    image: jbergstroem/mariadb-alpine
+    image: mariadb
     environment:
-      SKIP_INNODB: "yes"
       MYSQL_DATABASE: fet2020db
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
      - ../mysql_django:/var/lib/mysql
   etherpadsql:
-    image: jbergstroem/mariadb-alpine
+    image: mariadb
     environment:
-      SKIP_INNODB: "no"
       MYSQL_DATABASE: etherpaddb
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
      - ../mysql_etherpad:/var/lib/mysql
   etherpad:
@@ -37,8 +37,8 @@ services:
       DB_HOST: etherpadsql
       DB_PORT: 3306
       DB_NAME: etherpaddb
-      DB_USER: user
-      DB_PASS: hgu
+      DB_USER: root
+      DB_PASS: ""
       DB_CHARSET: utf8
       #ADMIN_PASSWORD: "AndiS"
       #REQUIRE_AUTHENTICATION: "false"
@@ -51,6 +51,7 @@ services:
      - "9001:9001"
     volumes:
      - ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
+     - ./deployment/mysql.cnf:/etc/mysql/conf.d
   fet2020:
     image: fet2020django
     build: .