From a0ddbd8370cad94d5ccb5570a774e4f448ecc3a6 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@geekchimp.com>
Date: Thu, 21 Jun 2018 23:01:46 +0200
Subject: [PATCH] :ambulance: Fixes upstream changed webroot location

---
 .../rootfs/etc/cont-init.d/13-persistent-data.sh       | 10 +++++-----
 tasmoadmin/rootfs/etc/nginx/nginx-ssl.conf             |  2 +-
 tasmoadmin/rootfs/etc/nginx/nginx.conf                 |  2 +-
 tasmoadmin/rootfs/etc/php7/blacklist.txt               |  2 +-
 .../var/www/tasmoadmin/{ => tasmoadmin}/.dockerenv     |  0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename tasmoadmin/rootfs/var/www/tasmoadmin/{ => tasmoadmin}/.dockerenv (100%)

diff --git a/tasmoadmin/rootfs/etc/cont-init.d/13-persistent-data.sh b/tasmoadmin/rootfs/etc/cont-init.d/13-persistent-data.sh
index 87a5b4b..4435034 100644
--- a/tasmoadmin/rootfs/etc/cont-init.d/13-persistent-data.sh
+++ b/tasmoadmin/rootfs/etc/cont-init.d/13-persistent-data.sh
@@ -10,14 +10,14 @@ if ! hass.directory_exists "/data/tasmoadmin"; then
     hass.log.debug 'Data directory not initialized, doing that now...'
 
     # Setup structure
-    cp -R /var/www/tasmoadmin/data /data/tasmoadmin
+    cp -R /var/www/tasmoadmin/tasmoadmin/data /data/tasmoadmin
 
     # Ensure file permissions
     chown -R nginx:nginx /data/tasmoadmin
-    find /data/tasmoadmin -not -perm 0644 -type f -exec chmod 0644 {} \;
-    find /data/tasmoadmin -not -perm 0755 -type d -exec chmod 0755 {} \;
+    find /data/tasmoadmin/tasmoadmin -not -perm 0644 -type f -exec chmod 0644 {} \;
+    find /data/tasmoadmin/tasmoadmin -not -perm 0755 -type d -exec chmod 0755 {} \;
 fi
 
 hass.log.debug 'Symlinking data directory to persistent storage location...'
-rm -f -r /var/www/tasmoadmin/data
-ln -s /data/tasmoadmin /var/www/tasmoadmin/data
+rm -f -r /var/www/tasmoadmin/tasmoadmin/data
+ln -s /data/tasmoadmin /var/www/tasmoadmin/tasmoadmin/data
diff --git a/tasmoadmin/rootfs/etc/nginx/nginx-ssl.conf b/tasmoadmin/rootfs/etc/nginx/nginx-ssl.conf
index 7e97f6c..672e841 100755
--- a/tasmoadmin/rootfs/etc/nginx/nginx-ssl.conf
+++ b/tasmoadmin/rootfs/etc/nginx/nginx-ssl.conf
@@ -16,7 +16,7 @@ http {
         server_name hassio.local;
         listen 9541 default_server ssl;
         listen [::]:9541 default_server ssl;
-        root /var/www/tasmoadmin;
+        root /var/www/tasmoadmin/tasmoadmin;
         index index.php;
 
         ssl_certificate /ssl/%%certfile%%;
diff --git a/tasmoadmin/rootfs/etc/nginx/nginx.conf b/tasmoadmin/rootfs/etc/nginx/nginx.conf
index ed57020..5b605f6 100755
--- a/tasmoadmin/rootfs/etc/nginx/nginx.conf
+++ b/tasmoadmin/rootfs/etc/nginx/nginx.conf
@@ -16,7 +16,7 @@ http {
         server_name hassio.local;
         listen 9541 default_server;
         listen [::]:9541 default_server;
-        root /var/www/tasmoadmin/;
+        root /var/www/tasmoadmin/tasmoadmin/;
         index index.php;
 
         location /data/firmwares {
diff --git a/tasmoadmin/rootfs/etc/php7/blacklist.txt b/tasmoadmin/rootfs/etc/php7/blacklist.txt
index 78ebbe6..4f64366 100644
--- a/tasmoadmin/rootfs/etc/php7/blacklist.txt
+++ b/tasmoadmin/rootfs/etc/php7/blacklist.txt
@@ -1,2 +1,2 @@
 /data/tasmoadmin/*
-/var/www/tasmoadmin/data/*
+/var/www/tasmoadmin/tasmoadmin/data/*
diff --git a/tasmoadmin/rootfs/var/www/tasmoadmin/.dockerenv b/tasmoadmin/rootfs/var/www/tasmoadmin/tasmoadmin/.dockerenv
similarity index 100%
rename from tasmoadmin/rootfs/var/www/tasmoadmin/.dockerenv
rename to tasmoadmin/rootfs/var/www/tasmoadmin/tasmoadmin/.dockerenv