From f904c0d5dbe75f9d291ac5219bbd42240e2f5fea Mon Sep 17 00:00:00 2001
From: Tim <tim@susa.pw>
Date: Mon, 20 Jul 2020 16:19:11 +0200
Subject: [PATCH] Finished

---
 {docker => config}/nginx/default.conf | 2 +-
 {docker => config}/php/php.ini        | 0
 docker-compose.yaml                   | 9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename {docker => config}/nginx/default.conf (86%)
 rename {docker => config}/php/php.ini (100%)

diff --git a/docker/nginx/default.conf b/config/nginx/default.conf
similarity index 86%
rename from docker/nginx/default.conf
rename to config/nginx/default.conf
index 8103348..dc4b5f1 100644
--- a/docker/nginx/default.conf
+++ b/config/nginx/default.conf
@@ -11,7 +11,7 @@ server {
         fastcgi_pass php:9000;
         fastcgi_index index.php;
         include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME /var/www$fastcgi_script_name;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
     }
      
diff --git a/docker/php/php.ini b/config/php/php.ini
similarity index 100%
rename from docker/php/php.ini
rename to config/php/php.ini
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 42d8947..addaba3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,8 +5,8 @@ services:
         build:
             context: './docker/php'
         volumes:
-            - './www-data:/var/www'
-            - './docker/php/php.ini:/usr/local/etc/php/conf.d/php.override.ini'
+            - './data/www:/var/www'
+            - './config/php/php.ini:/usr/local/etc/php/conf.d/php.override.ini'
             - './logs/php:/var/log/php' 
         environment:
             MYSQL_USER: ${MYSQL_USER}
@@ -19,17 +19,18 @@ services:
             - 8123:80
         volumes:
             - './data/www:/var/www'
-            - './docker/nginx/default.conf:/etc/nginx/conf.d/default.conf'
+            - './config/nginx/default.conf:/etc/nginx/conf.d/default.conf'
             - './logs/nginx:/var/log/nginx'          
         depends_on:
             - php
+
     mysql:
         restart: always
         image: linuxserver/mariadb
         volumes:
             - './data/mariadb/databases:/config/databases'
             - './logs/mariadb:/config/log/mysql'
-            - './data/mariadb:/config/custom.cnf'
+            - './config/mariadb/:/config/custom.cnf'
         depends_on:
             - php
         environment: