avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-26 18:43:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove silent

Browse Source
This commit is contained in:
Alexandre
2021-12-27 17:46:02 +01:00
parent dabddb6986
commit c49b63a6c1
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
firefly_iii/config.json
View File

@@ -12,8 +12,7 @@
"options": { "options": {
"DB_CONNECTION": "sqlite", "DB_CONNECTION": "sqlite",
"APP_KEY": "CHANGEME_32_CHARS_EuC5dfn3LAPzeO", "APP_KEY": "CHANGEME_32_CHARS_EuC5dfn3LAPzeO",
"CONFIG_LOCATION": "/config/addons_config/fireflyiii/config.yaml", "CONFIG_LOCATION": "/config/addons_config/fireflyiii/config.yaml"
"silent": true
}, },
"ports": { "ports": {
"8080/tcp": 3473 "8080/tcp": 3473
@@ -29,8 +28,7 @@
"DB_PORT": "str?", "DB_PORT": "str?",
"DB_DATABASE": "str?", "DB_DATABASE": "str?",
"DB_USERNAME": "str?", "DB_USERNAME": "str?",
"DB_PASSWORD": "str?", "DB_PASSWORD": "str?"
"silent": "bool"
}, },
"slug": "fireflyiii", "slug": "fireflyiii",
"services": ["mysql:want"], "services": ["mysql:want"],

16
firefly_iii/rootfs/scripts/99-run.sh
View File

@@ -26,9 +26,9 @@ mariadb_addon)
bashio::log.info "Using MariaDB addon. Requirements : running MariaDB addon" bashio::log.info "Using MariaDB addon. Requirements : running MariaDB addon"
if ! bashio::services.available 'mysql'; then if ! bashio::services.available 'mysql'; then
bashio::log.fatal \ bashio::log.fatal \
"Local database access should be provided by the MariaDB addon" "Local database access should be provided by the MariaDB addon"
bashio::exit.nok \ bashio::exit.nok \
"Please ensure it is installed and started" "Please ensure it is installed and started"
fi fi
export DB_CONNECTION=mysql export DB_CONNECTION=mysql
@@ -43,9 +43,9 @@ mariadb_addon)
bashio::log.info "Creating database for Firefly-iii if required" bashio::log.info "Creating database for Firefly-iii if required"
mysql \ mysql \
-u "${username}" -p"${password}" \ -u "${username}" -p"${password}" \
-h "${host}" -P "${port}" \ -h "${host}" -P "${port}" \
-e "CREATE DATABASE IF NOT EXISTS \`firefly\` ;" -e "CREATE DATABASE IF NOT EXISTS \`firefly\` ;"
;; ;;
# Use remote # Use remote
@@ -68,8 +68,4 @@ php artisan firefly-iii:upgrade-database
# LAUNCH APP # # LAUNCH APP #
############## ##############
if bashio::config.true "silent"; then /./usr/local/bin/entrypoint.sh
/./usr/local/bin/entrypoint.sh >/dev/null
else
/./usr/local/bin/entrypoint.sh
fi