diff --git a/firefly_iii/config.json b/firefly_iii/config.json index 5a7aa091d..a4fbc839e 100644 --- a/firefly_iii/config.json +++ b/firefly_iii/config.json @@ -32,8 +32,8 @@ }, "slug": "fireflyiii", "services": ["mysql:want"], - "upstream": "1.3", + "upstream": "1.4", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.3", + "version": "1.4", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/firefly_iii/rootfs/scripts/20-folders.sh b/firefly_iii/rootfs/scripts/20-folders.sh index 0e2db6713..4bc5793a3 100644 --- a/firefly_iii/rootfs/scripts/20-folders.sh +++ b/firefly_iii/rootfs/scripts/20-folders.sh @@ -3,13 +3,7 @@ echo "Connecting database to /config/addons_config/fireflyiii" # Create directory -mkdir -p /data/firefly mkdir -p /config/addons_config/fireflyiii/storage # Make sure permissions are right chown -R $(id -u):$(id -g) /config/addons_config/fireflyiii - -# Make symlink -cp -r /var/www/html/storage /config/addons_config/fireflyiii/storage -rm -r /data/firefly/storage -ln -sf /config/addons_config/fireflyiii/storage /data/firefly/storage diff --git a/firefly_iii/rootfs/scripts/99-run.sh b/firefly_iii/rootfs/scripts/99-run.sh index 095a3acf5..7669c8893 100644 --- a/firefly_iii/rootfs/scripts/99-run.sh +++ b/firefly_iii/rootfs/scripts/99-run.sh @@ -2,23 +2,32 @@ bashio::log.info "Launching app" -# Backup APP_KEY file +####################### +# Backup APP_KEY file # +####################### bashio::log.info "Backuping APP_KEY to /config/addons_config/fireflyiii/APP_KEY_BACKUP.txt" APP_KEY="$(bashio::config 'APP_KEY')" echo "$APP_KEY" >/config/addons_config/fireflyiii/APP_KEY_BACKUP.txt if [ ! ${#APP_KEY} = 32 ]; then bashio::exit.nok "Your APP_KEY has ${#APP_KEY} instead of 32 characters"; fi -# Define database +################### +# Define database # +################### + bashio::log.info "Defining database" case $(bashio::config 'DB_CONNECTION') in # Use sqlite sqlite_internal) bashio::log.info "Using built in sqlite" + # Set variable export DB_CONNECTION=sqlite - touch ./storage/database/database.sqlite - php artisan migrate --seed - php artisan firefly-iii:upgrade-database + # Creating database + mkdir -p /config/addons_config/fireflyiii/database + touch /config/addons_config/fireflyiii/database/database.sqlite + # Symlink + rm -r /var/www/html/storage/database + ln -sf /config/addons_config/fireflyiii/database /var/www/html/storage ;; # Use MariaDB