From 603e611436de80e7df4d7bf568d0b2b3ea0a5607 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Sun, 16 Jan 2022 11:22:49 +0100
Subject: [PATCH] permissions correction

https://github.com/alexbelgium/hassio-addons/issues/162
---
 fireflyiii/CHANGELOG.md                        |  1 +
 fireflyiii/config.json                         |  2 +-
 .../rootfs/etc/cont-init.d/20-folders.sh       |  8 --------
 fireflyiii/rootfs/etc/cont-init.d/99-run.sh    | 18 +++++++++---------
 4 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 fireflyiii/rootfs/etc/cont-init.d/20-folders.sh

diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md
index 4bd18c2a8..58d58302a 100644
--- a/fireflyiii/CHANGELOG.md
+++ b/fireflyiii/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Correct permissions
 - Allowed automatic update in hourly, daily or weekly setting from addon options
 
 ## 5.6.10 (09-01-2022)
diff --git a/fireflyiii/config.json b/fireflyiii/config.json
index dc05ea4a5..fb98d5afe 100644
--- a/fireflyiii/config.json
+++ b/fireflyiii/config.json
@@ -46,6 +46,6 @@
   ],
   "upstream": "5.6.10",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "5.6.10",
+  "version": "5.6.10-1",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }
diff --git a/fireflyiii/rootfs/etc/cont-init.d/20-folders.sh b/fireflyiii/rootfs/etc/cont-init.d/20-folders.sh
deleted file mode 100644
index 22ae1e2fd..000000000
--- a/fireflyiii/rootfs/etc/cont-init.d/20-folders.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bashio
-
-# Create directory
-mkdir -p /config/addons_config/fireflyiii
-
-# Make sure permissions are right
-chmod -R 755 /config/addons_config
-chown -R $(id -u):$(id -g) /config/addons_config/fireflyiii
diff --git a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh
index 3f0b81452..af1ccedbc 100644
--- a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh
+++ b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh
@@ -12,7 +12,7 @@ if [ ! ${#APP_KEY} = 32 ]; then bashio::exit.nok "Your APP_KEY has ${#APP_KEY} i
 
 # Backup APP_KEY file
 bashio::log.info "Backuping APP_KEY to /config/addons_config/fireflyiii/APP_KEY_BACKUP.txt"
-bashio::log.warning "Changing this value will require to reset your database" 
+bashio::log.warning "Changing this value will require to reset your database"
 
 # Get current app_key
 mkdir -p /config/addons_config/fireflyiii
@@ -21,9 +21,15 @@ CURRENT=$(sed -e '/^[<blank><tab>]*$/d' /config/addons_config/fireflyiii/APP_KEY
 
 # Save if new
 if [ "$CURRENT" != "$APP_KEY" ]; then
-echo "$APP_KEY" >>/config/addons_config/fireflyiii/APP_KEY_BACKUP.txt
+    echo "$APP_KEY" >>/config/addons_config/fireflyiii/APP_KEY_BACKUP.txt
 fi
 
+# Update permissions
+mkdir -p /config/addons_config/fireflyiii
+chown -R www-data:www-data /config/addons_config/fireflyiii
+chown -R www-data:www-data /var/www/html/storage
+chmod -R 775 /config/addons_config/fireflyiii
+
 ###################
 # Define database #
 ###################
@@ -60,13 +66,7 @@ sqlite_internal)
     # Updating permissions
     chmod 775 /config/addons_config/fireflyiii/database/database.sqlite
     chown -R www-data:www-data /config/addons_config/fireflyiii
-
-#    chown -R www-data:www-data /config/addons_config/fireflyiii
-#    chown -R www-data:www-data /var/www/html/storage/database
-
-#    mkdir -p /config/addons_config/fireflyiii/database
-#    touch /var/www/html/storage/database/database.sqlite
-#    touch /config/addons_config/fireflyiii/database/database.sqlite
+    chown -R www-data:www-data /var/www/html/storage
     ;;
 
 # Use MariaDB