diff --git a/.templates/90-config_yaml.sh b/.templates/01-config_yaml.sh old mode 100755 new mode 100644 similarity index 99% rename from .templates/90-config_yaml.sh rename to .templates/01-config_yaml.sh index 752b504aa..8027e74c8 --- a/.templates/90-config_yaml.sh +++ b/.templates/01-config_yaml.sh @@ -32,7 +32,7 @@ if bashio::config.has_value 'CONFIG_LOCATION'; then CONFIGSOURCE=/config/addons_config/${HOSTNAME#*-} bashio::log.fatal "Watch-out : your CONFIG_LOCATION values can only be set in /share, /config or /data (internal to addon). It will be reset to the default location : $CONFIGSOURCE" fi - + else # Use default CONFIGSOURCE="/config/addons_config/${HOSTNAME#*-}/config.yaml" diff --git a/.templates/ha_automodules.sh b/.templates/ha_automodules.sh index 4825caa4b..223360d45 100755 --- a/.templates/ha_automodules.sh +++ b/.templates/ha_automodules.sh @@ -7,7 +7,7 @@ set -e ############################## MODULES="$1" -MODULES="$MODULES 00-banner.sh 01-custom_script.sh 90-config_yaml.sh 00-global_var.sh" +MODULES="$MODULES 00-banner.sh 01-custom_script.sh 01-config_yaml.sh 00-global_var.sh" echo "To download : $MODULES" # Install bash if not available diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 9d0793cc8..807c9895e 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -47,7 +47,7 @@ RUN \ COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 90-config_yaml.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 01-config_yaml.sh" # Automatic modules download ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 5f9cd42fb..53049aaa0 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -43,7 +43,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 90-config_yaml.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 01-config_yaml.sh" # Automatic modules download ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index d6aa66125..e72808ddd 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -38,7 +38,7 @@ ENV TZ=Europe/Paris COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 01-config_yaml.sh" # Automatic modules download ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index aab06195f..7e29c28e9 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -41,7 +41,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-config_yaml.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 01-config_yaml.sh" # Automatic modules download ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index e4f70eaa8..ae04c9f7c 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -43,7 +43,7 @@ RUN \ COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 90-config_yaml.sh 00-local_mounts.sh 00-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 01-config_yaml.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" diff --git a/seafile/Dockerfile b/seafile/Dockerfile index bf8fb47a2..570e106eb 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -41,7 +41,7 @@ USER root COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 01-config_yaml.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index 5bd30ab64..87a24c610 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -47,7 +47,7 @@ RUN \ COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh 00-local_mounts.sh 00-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 01-config_yaml.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" diff --git a/wger/Dockerfile b/wger/Dockerfile index 711f13d6c..d077404a0 100644 --- a/wger/Dockerfile +++ b/wger/Dockerfile @@ -47,7 +47,7 @@ RUN echo "wger ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 01-config_yaml.sh" # Automatic modules download ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"