From f6b63d00fa13b1eb136c7146e3e1fe795671accf Mon Sep 17 00:00:00 2001
From: Tim <tim@susa.pw>
Date: Mon, 20 Jul 2020 16:09:18 +0200
Subject: [PATCH] Changed Mariadb Container

---
 data/www/connect.php              | 17 +++++++++++++++++
 {www-data => data/www}/index.html |  0
 {www-data => data/www}/index.php  |  0
 docker-compose.yaml               | 14 +++++++++-----
 docker/mariadb/my.cnf             |  9 ---------
 www-data/connect.php              | 21 ---------------------
 6 files changed, 26 insertions(+), 35 deletions(-)
 create mode 100644 data/www/connect.php
 rename {www-data => data/www}/index.html (100%)
 rename {www-data => data/www}/index.php (100%)
 delete mode 100644 docker/mariadb/my.cnf
 delete mode 100644 www-data/connect.php

diff --git a/data/www/connect.php b/data/www/connect.php
new file mode 100644
index 0000000..4a8e76c
--- /dev/null
+++ b/data/www/connect.php
@@ -0,0 +1,17 @@
+<?
+
+$host = 'mysql';
+$user = getenv('MYSQL_USER');
+//$user = 'bla';
+$pass = getenv('MYSQL_PASSWORD');
+     
+$conn = mysqli_connect($host, $user, $pass);
+
+if (!$conn) {
+    exit('Connection failed: '.mysqli_connect_error().PHP_EOL);
+}
+     
+echo 'Successful database connection!'.PHP_EOL;
+
+
+?>
\ No newline at end of file
diff --git a/www-data/index.html b/data/www/index.html
similarity index 100%
rename from www-data/index.html
rename to data/www/index.html
diff --git a/www-data/index.php b/data/www/index.php
similarity index 100%
rename from www-data/index.php
rename to data/www/index.php
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f08ada6..42d8947 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -18,21 +18,25 @@ services:
         ports:
             - 8123:80
         volumes:
-            - './www-data:/var/www'
+            - './data/www:/var/www'
             - './docker/nginx/default.conf:/etc/nginx/conf.d/default.conf'
             - './logs/nginx:/var/log/nginx'          
         depends_on:
             - php
     mysql:
         restart: always
-        image: mariadb:latest
+        image: linuxserver/mariadb
         volumes:
-            - './docker/mariadb/my.cnf:/etc/mysql/conf.d/db.cnf'
-            - './logs/mariadb:/var/log/mariadb'
+            - './data/mariadb/databases:/config/databases'
+            - './logs/mariadb:/config/log/mysql'
+            - './data/mariadb:/config/custom.cnf'
         depends_on:
             - php
         environment:
             MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
             MYSQL_DATABASE: ${MYSQL_DATABASE}
             MYSQL_USER: ${MYSQL_USER}
-            MYSQL_PASSWORD: ${MYSQL_PASSWORD}
\ No newline at end of file
+            MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+            PUID: 1000
+            PGID: 1000
+            TZ: Europe/Berlin
diff --git a/docker/mariadb/my.cnf b/docker/mariadb/my.cnf
deleted file mode 100644
index f060b37..0000000
--- a/docker/mariadb/my.cnf
+++ /dev/null
@@ -1,9 +0,0 @@
-[mariadb]
-
-
-# Logging
-general_log_file                = /var/log/mariadb/mysql.log
-general_log                     = 1
-log_warnings                    = 2
-log_error                       = /var/log/mariadb/mariadb_error.log
-slow_query_log_file             = /var/log/mariadb/mariadb_slow.log
\ No newline at end of file
diff --git a/www-data/connect.php b/www-data/connect.php
deleted file mode 100644
index 1198949..0000000
--- a/www-data/connect.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?
-
-$host = 'mysql';
-$user = getenv('MYSQL_USER');
-$pass = getenv('MYSQL_PASSWORD');
-     
-$conn = mysqli_connect($host, $user, $pass);
-$res = mysql_query("SHOW DATABASES");
-
-while ($row = mysql_fetch_assoc($res)) {
-    echo $row['Database'] . "\n";
-}
-
-//if (!$conn) {
-//    exit('Connection failed: '.mysqli_connect_error().PHP_EOL);
-//}
-     
-//echo 'Successful database connection!'.PHP_EOL;
-
-
-?>
\ No newline at end of file