From c98b3db85b42a35d623155cacd63d49610b1c3ba Mon Sep 17 00:00:00 2001 From: bruvv Date: Sat, 1 Jan 2022 20:49:05 +0100 Subject: [PATCH 01/23] reverted docker bin bash --- addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh | 3 ++- arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- .../rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- .../rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- .../rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- .../rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- joal/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- .../rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- photoprism/rootfs/00-aaa_dockerfile_backup.sh | 2 +- photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- .../rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- webtop/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- wger/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh | 2 +- xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh | 2 +- zzz_templates/00-aaa_dockerfile_backup.sh | 2 +- 54 files changed, 55 insertions(+), 54 deletions(-) diff --git a/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh b/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh index 2082a4ea6..fa0b3f4cf 100644 --- a/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -1,5 +1,6 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash # If dockerfile failed install manually + if [ -e "/ENVFILE" ]; then echo "Executing script" PACKAGES=$( Date: Sun, 2 Jan 2022 08:11:51 +0100 Subject: [PATCH 02/23] Try to avoid netlink socket issues --- qbittorrent/apparmor.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/qbittorrent/apparmor.txt b/qbittorrent/apparmor.txt index b494bb495..663c7bf93 100644 --- a/qbittorrent/apparmor.txt +++ b/qbittorrent/apparmor.txt @@ -8,6 +8,7 @@ profile db21ed7f_qbittorrent flags=(attach_disconnected,mediate_deleted) { mount, umount, remount, + network, capability setgid, capability chown, From aba34ffd0a5346b415ddda90fe77be826a344450 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 08:28:51 +0100 Subject: [PATCH 03/23] Correct entrypoint --- scrutiny/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index 2c2724bfe..566f4c4bb 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -22,11 +22,8 @@ FROM ${BUILD_FROM} ################## RUN \ - # Install script - chmod a+x /run.sh \ - \ # Allow UID and GID setting - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ + sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ # use /data instead of /config for database From 2850cbfcc143982c8cedb833be56d5e232ddb282 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 08:29:14 +0100 Subject: [PATCH 04/23] Update config.json --- scrutiny/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scrutiny/config.json b/scrutiny/config.json index 6c94cbaaf..f6cae659f 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -1,6 +1,6 @@ { "name": "Scrutiny", - "version": "0.3.13-3", + "version": "0.3.13-4", "upstream": "0.3.13", "slug": "scrutiny", "description": "Scrutiny WebUI for smartd S.M.A.R.T monitoring", From 93b5c6d5963d2c8ead878c41c8c0d013c6256c28 Mon Sep 17 00:00:00 2001 From: bruvv Date: Sun, 2 Jan 2022 10:41:34 +0100 Subject: [PATCH 05/23] reverted bin bash and changed folder locations --- bazarr/rootfs/etc/cont-init.d/20-folders.sh | 8 +++++++- emby/rootfs/etc/cont-init.d/20-folders.sh | 18 +++++++++++++----- jackett/rootfs/etc/cont-init.d/20-folders.sh | 2 +- jellyfin/rootfs/etc/cont-init.d/20-folders.sh | 2 +- prowlarr/rootfs/etc/cont-init.d/20-folders.sh | 4 ++-- radarr/rootfs/etc/cont-init.d/20-folders.sh | 8 ++++---- readarr/rootfs/etc/cont-init.d/20-folders.sh | 19 ++++++++++--------- sonarr/rootfs/etc/cont-init.d/20-folders.sh | 12 ++++++------ zzz_templates/00-bettercomments.sh | 2 +- zzz_templates/automatic_packages.sh | 2 +- 10 files changed, 46 insertions(+), 31 deletions(-) diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders.sh b/bazarr/rootfs/etc/cont-init.d/20-folders.sh index b5a64e91e..ac8d1c7a5 100644 --- a/bazarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/bazarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /share/storage/movies ]; then echo "Creating /share/storage/movies" @@ -6,6 +6,12 @@ if [ ! -d /share/storage/movies ]; then chown -R abc:abc /share/storage/movies fi +if [ ! -d /share/storage/tv ]; then + echo "Creating /share/storage/tv" + mkdir -p /share/storage/tv + chown -R abc:abc /share/storage/tv +fi + if [ ! -d /share/downloads ]; then echo "Creating /share/downloads" mkdir -p /share/downloads diff --git a/emby/rootfs/etc/cont-init.d/20-folders.sh b/emby/rootfs/etc/cont-init.d/20-folders.sh index 7765f925c..17e59c0d6 100644 --- a/emby/rootfs/etc/cont-init.d/20-folders.sh +++ b/emby/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /emby ]; then echo "Creating /emby" @@ -24,10 +24,18 @@ if [ ! -d /share/emby ]; then chown -R abc:abc /share/emby fi -if [ ! -d /config/emby ]; then - echo "Creating /config/emby" - mkdir -p /config/emby - chown -R abc:abc /config/emby +if [ -d /config/emby ] && [ ! -d /config/addons_config/emby ]; then + echo "Moving to new location /config/addons_config/emby" + mkdir -p /config/addons_config/emby + chown -R abc:abc /config/addons_config/emby + mv /config/emby/* /config/addons_config/emby/ + rm -r /config/emby +fi + +if [ ! -d /config/addons_config/emby ]; then + echo "Creating /config/addons_config/emby" + mkdir -p /config/addons_config/emby + chown -R abc:abc /config/addons_config/emby fi # links diff --git a/jackett/rootfs/etc/cont-init.d/20-folders.sh b/jackett/rootfs/etc/cont-init.d/20-folders.sh index 187bfc32f..f4d27377c 100644 --- a/jackett/rootfs/etc/cont-init.d/20-folders.sh +++ b/jackett/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /share/downloads ]; then echo "Creating /share/downloads" diff --git a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh index 1d8c2904c..877cd36e9 100644 --- a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh +++ b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /jellyfin ]; then echo "Creating /jellyfin" diff --git a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh index 5fdccc325..10a5bdc48 100644 --- a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,6 +1,6 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash -if [ -d /config/prowlarr ]; then +if [ -d /config/prowlarr ] && [ ! -d /config/addons_config/prowlarr ]; then echo "Moving to new location /config/addons_config/prowlarr" mkdir -p /config/addons_config/prowlarr chown -R abc:abc /config/addons_config/prowlarr diff --git a/radarr/rootfs/etc/cont-init.d/20-folders.sh b/radarr/rootfs/etc/cont-init.d/20-folders.sh index 79f3df9e7..f497e47b3 100644 --- a/radarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/radarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash if [ ! -d /share/storage/movies ]; then echo "Creating /share/storage/movies" @@ -12,15 +12,15 @@ if [ ! -d /share/downloads ]; then chown -R abc:abc /share/downloads fi -if [ ! -d /config/addons_config/radarr ]; then -if [ -d /config/radarr ]; then +if [ -d /config/radarr ] && [ ! -d /config/addons_config/radarr ]; then echo "Moving to new location /config/addons_config/radarr" mkdir -p /config/addons_config/radarr chown -R abc:abc /config/addons_config/radarr mv /config/radarr/* /config/addons_config/radarr/ rm -r /config/radarr fi - + +if [ ! -d /config/addons_config/radarr ]; then echo "Creating /config/addons_config/radarr" mkdir -p /config/addons_config/radarr chown -R abc:abc /config/addons_config/radarr diff --git a/readarr/rootfs/etc/cont-init.d/20-folders.sh b/readarr/rootfs/etc/cont-init.d/20-folders.sh index 54a9a8d81..ee243a46c 100644 --- a/readarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/readarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,9 +1,9 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash -if [ ! -d /share/music ]; then - echo "Creating /share/music" - mkdir -p /share/music - chown -R abc:abc /share/music +if [ ! -d /share/storage/ebook ]; then + echo "Creating /share/storage/ebook" + mkdir -p /share/storage/ebook + chown -R abc:abc /share/storage/ebook fi if [ ! -d /share/downloads ]; then @@ -12,15 +12,16 @@ if [ ! -d /share/downloads ]; then chown -R abc:abc /share/downloads fi -if [ ! -d /config/addons_config/readarr ]; then -if [ -d /config/readarr ]; then +if [ -d /config/readarr ] && [ ! -d /config/addons_config/readarr ]; then echo "Moving to new location /config/addons_config/readarr" mkdir -p /config/addons_config/readarr chown -R abc:abc /config/addons_config/readarr mv /config/readarr/* /config/addons_config/readarr/ rm -r /config/readarr -fi - echo "Creating /config/addons_config/readarr" +fi + +if [ ! -d /config/addons_config/readarr ]; then + echo "Creating /config/addons_config/readarr" mkdir -p /config/addons_config/readarr chown -R abc:abc /config/addons_config/readarr fi diff --git a/sonarr/rootfs/etc/cont-init.d/20-folders.sh b/sonarr/rootfs/etc/cont-init.d/20-folders.sh index f2c586c1b..36f96c5ed 100644 --- a/sonarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/sonarr/rootfs/etc/cont-init.d/20-folders.sh @@ -1,9 +1,9 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash -if [ ! -d /share/storage/movies ]; then - echo "Creating /share/storage/movies" - mkdir -p /share/storage/movies - chown -R abc:abc /share/storage/movies +if [ ! -d /share/storage/tv ]; then + echo "Creating /share/storage/tv" + mkdir -p /share/storage/tv + chown -R abc:abc /share/storage/tv fi if [ ! -d /share/downloads ]; then @@ -12,7 +12,7 @@ if [ ! -d /share/downloads ]; then chown -R abc:abc /share/downloads fi -if [ -d /config/sonarr ]; then +if [ -d /config/sonarr ] && [ ! -d /config/addons_config/sonarr ]; then echo "Moving to new location /config/addons_config/sonarr" mkdir -p /config/addons_config/sonarr chown -R abc:abc /config/addons_config/sonarr diff --git a/zzz_templates/00-bettercomments.sh b/zzz_templates/00-bettercomments.sh index b31a742fa..32acdb462 100644 --- a/zzz_templates/00-bettercomments.sh +++ b/zzz_templates/00-bettercomments.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash # Color comments #! Red diff --git a/zzz_templates/automatic_packages.sh b/zzz_templates/automatic_packages.sh index 8c3d67582..d7c66640b 100644 --- a/zzz_templates/automatic_packages.sh +++ b/zzz_templates/automatic_packages.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ######## # INIT # From 005cb6b2de1a3efe043cd8eb4f792599e52d8b5c Mon Sep 17 00:00:00 2001 From: bruvv Date: Sun, 2 Jan 2022 10:44:00 +0100 Subject: [PATCH 06/23] fixed more binbash --- arpspoof/rootfs/scripts/00-global_var.sh | 2 +- enedisgateway2mqtt/rootfs/scripts/00-global_var.sh | 2 +- enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh | 2 +- fireflyiii/rootfs/scripts/00-global_var.sh | 2 +- fireflyiii_data_importer/rootfs/scripts/00-global_var.sh | 2 +- joplin/rootfs/scripts/00-global_var.sh | 2 +- whoogle/rootfs/scripts/00-global_var.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arpspoof/rootfs/scripts/00-global_var.sh b/arpspoof/rootfs/scripts/00-global_var.sh index 42e6d262c..dc39300ec 100644 --- a/arpspoof/rootfs/scripts/00-global_var.sh +++ b/arpspoof/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ################################### # Export all addon options as env # diff --git a/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh b/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh index 6de2954f0..31f3b505d 100644 --- a/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh +++ b/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ################################### # Export all addon options as env # diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh index 42e6d262c..dc39300ec 100644 --- a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh +++ b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ################################### # Export all addon options as env # diff --git a/fireflyiii/rootfs/scripts/00-global_var.sh b/fireflyiii/rootfs/scripts/00-global_var.sh index 42e6d262c..dc39300ec 100644 --- a/fireflyiii/rootfs/scripts/00-global_var.sh +++ b/fireflyiii/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ################################### # Export all addon options as env # diff --git a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh b/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh index 42e6d262c..dc39300ec 100644 --- a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh +++ b/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ################################### # Export all addon options as env # diff --git a/joplin/rootfs/scripts/00-global_var.sh b/joplin/rootfs/scripts/00-global_var.sh index 42e6d262c..dc39300ec 100644 --- a/joplin/rootfs/scripts/00-global_var.sh +++ b/joplin/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ################################### # Export all addon options as env # diff --git a/whoogle/rootfs/scripts/00-global_var.sh b/whoogle/rootfs/scripts/00-global_var.sh index b1b92fff6..1e8f44f89 100644 --- a/whoogle/rootfs/scripts/00-global_var.sh +++ b/whoogle/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/bin/bash ################################### # Export all addon options as env # From 9eac602dfdc8f02a3e6ccf52672302b4cb17e397 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 18:40:15 +0100 Subject: [PATCH 07/23] Update apparmor.txt --- qbittorrent/apparmor.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qbittorrent/apparmor.txt b/qbittorrent/apparmor.txt index 663c7bf93..25422cdab 100644 --- a/qbittorrent/apparmor.txt +++ b/qbittorrent/apparmor.txt @@ -8,7 +8,8 @@ profile db21ed7f_qbittorrent flags=(attach_disconnected,mediate_deleted) { mount, umount, remount, - network, + network, + network netlink raw, capability setgid, capability chown, From 38d980b7f4770dfab94db7003e253dac61d4400a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 18:40:33 +0100 Subject: [PATCH 08/23] network netlink raw, --- qbittorrent/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/config.json b/qbittorrent/config.json index a2a10d1f4..97a4e8da0 100644 --- a/qbittorrent/config.json +++ b/qbittorrent/config.json @@ -102,6 +102,6 @@ "slug": "qbittorrent", "upstream": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls159", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls160-2", + "version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls160-3", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } From 4e61972586dee1d965e0e65d7691c3f451fb2c82 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:12:01 +0100 Subject: [PATCH 09/23] Update apparmor.txt --- qbittorrent/apparmor.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qbittorrent/apparmor.txt b/qbittorrent/apparmor.txt index 25422cdab..b362645d2 100644 --- a/qbittorrent/apparmor.txt +++ b/qbittorrent/apparmor.txt @@ -8,7 +8,12 @@ profile db21ed7f_qbittorrent flags=(attach_disconnected,mediate_deleted) { mount, umount, remount, - network, + network udp, +network tcp, +network dgram, +network stream, +network inet, +network inet6, network netlink raw, capability setgid, From 9bcb637b4d8d832983d26282239529d947389f4f Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:12:20 +0100 Subject: [PATCH 10/23] Update apparmor.txt --- qbittorrent/apparmor.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qbittorrent/apparmor.txt b/qbittorrent/apparmor.txt index b362645d2..cf40bc380 100644 --- a/qbittorrent/apparmor.txt +++ b/qbittorrent/apparmor.txt @@ -9,11 +9,11 @@ profile db21ed7f_qbittorrent flags=(attach_disconnected,mediate_deleted) { umount, remount, network udp, -network tcp, -network dgram, -network stream, -network inet, -network inet6, + network tcp, + network dgram, + network stream, + network inet, + network inet6, network netlink raw, capability setgid, From 1902a047b37944c1f0859213de3e59b9af41f521 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:17:35 +0100 Subject: [PATCH 11/23] More explicit --- fireflyiii/Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fireflyiii/Readme.md b/fireflyiii/Readme.md index 37b1f4a71..963dad6b1 100644 --- a/fireflyiii/Readme.md +++ b/fireflyiii/Readme.md @@ -38,9 +38,9 @@ Options can be configured through two ways : - Config.yaml -Configuration is done by customizing the config.yaml in the location defined in your addon options +Additional variables can be set as ENV variables by adding them in the config.yaml in the location defined in your addon options -The complete list of options can be seen here : https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/.env.example +The complete list of ENV variables can be seen here : https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/.env.example ## Installation From d52efef21e77cd618129992582a8ce6cfcfaa2c6 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:20:47 +0100 Subject: [PATCH 12/23] Align with other scripts --- addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh b/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh index fa0b3f4cf..1a3fd0934 100644 --- a/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/addons_updater/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -1,6 +1,5 @@ #!/bin/bash # If dockerfile failed install manually - if [ -e "/ENVFILE" ]; then echo "Executing script" PACKAGES=$( Date: Sun, 2 Jan 2022 19:23:04 +0100 Subject: [PATCH 13/23] export $line --- whoogle/rootfs/scripts/00-global_var.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whoogle/rootfs/scripts/00-global_var.sh b/whoogle/rootfs/scripts/00-global_var.sh index 1e8f44f89..a7852a0d8 100644 --- a/whoogle/rootfs/scripts/00-global_var.sh +++ b/whoogle/rootfs/scripts/00-global_var.sh @@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do line="${KEYS}=${VALUE//[\"\']/}" # Use locally if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi - export line + export $line # Export the variable to run scripts line="${KEYS}=${VALUE//[\"\']/} &>/dev/null" sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run* From 2a0c8dd180746c66b6b8aeef52c07400e0e9fa2f Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:24:36 +0100 Subject: [PATCH 14/23] Update 00-global_var.sh --- arpspoof/rootfs/scripts/00-global_var.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arpspoof/rootfs/scripts/00-global_var.sh b/arpspoof/rootfs/scripts/00-global_var.sh index dc39300ec..b68e3f08b 100644 --- a/arpspoof/rootfs/scripts/00-global_var.sh +++ b/arpspoof/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################################### # Export all addon options as env # @@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do line="${KEYS}=${VALUE//[\"\']/}" # Use locally if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi - export line + export $line # Export the variable to run scripts line="${KEYS}=${VALUE//[\"\']/} &>/dev/null" sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run* From 624465cdd303026eaa00da13c6e2cfc060a42bdb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:25:45 +0100 Subject: [PATCH 15/23] #!/usr/bin/with-contenv bashio --- enedisgateway2mqtt/rootfs/scripts/00-global_var.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh b/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh index 31f3b505d..6de2954f0 100644 --- a/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh +++ b/enedisgateway2mqtt/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################################### # Export all addon options as env # From bb1e917987de1c48943bc03b57a8d92f0a69d48c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:26:33 +0100 Subject: [PATCH 16/23] Update 00-global_var.sh --- enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh index dc39300ec..b68e3f08b 100644 --- a/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh +++ b/enedisgateway2mqtt_dev/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################################### # Export all addon options as env # @@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do line="${KEYS}=${VALUE//[\"\']/}" # Use locally if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi - export line + export $line # Export the variable to run scripts line="${KEYS}=${VALUE//[\"\']/} &>/dev/null" sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run* From f908b581443f1f525fa4a28e49d4f7c6f3beefd5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:27:47 +0100 Subject: [PATCH 17/23] #!/usr/bin/with-contenv bashio --- fireflyiii/rootfs/scripts/00-global_var.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fireflyiii/rootfs/scripts/00-global_var.sh b/fireflyiii/rootfs/scripts/00-global_var.sh index dc39300ec..b68e3f08b 100644 --- a/fireflyiii/rootfs/scripts/00-global_var.sh +++ b/fireflyiii/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################################### # Export all addon options as env # @@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do line="${KEYS}=${VALUE//[\"\']/}" # Use locally if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi - export line + export $line # Export the variable to run scripts line="${KEYS}=${VALUE//[\"\']/} &>/dev/null" sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run* From e9c31394fff2184575cc3d454450ca6b2259fbdd Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:28:26 +0100 Subject: [PATCH 18/23] #!/usr/bin/with-contenv bashio --- fireflyiii_data_importer/rootfs/scripts/00-global_var.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh b/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh index dc39300ec..b68e3f08b 100644 --- a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh +++ b/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################################### # Export all addon options as env # @@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do line="${KEYS}=${VALUE//[\"\']/}" # Use locally if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi - export line + export $line # Export the variable to run scripts line="${KEYS}=${VALUE//[\"\']/} &>/dev/null" sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run* From 5490bbfb63779aa82b41c5f44f36c82077b3a502 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:29:22 +0100 Subject: [PATCH 19/23] #!/usr/bin/with-contenv bashio --- joplin/rootfs/scripts/00-global_var.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/joplin/rootfs/scripts/00-global_var.sh b/joplin/rootfs/scripts/00-global_var.sh index dc39300ec..b68e3f08b 100644 --- a/joplin/rootfs/scripts/00-global_var.sh +++ b/joplin/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################################### # Export all addon options as env # @@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do line="${KEYS}=${VALUE//[\"\']/}" # Use locally if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi - export line + export $line # Export the variable to run scripts line="${KEYS}=${VALUE//[\"\']/} &>/dev/null" sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run* From e8f2db8e874d48068ddfd9e08ddd7edb9d22fd75 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:32:53 +0100 Subject: [PATCH 20/23] #!/usr/bin/with-contenv bashio --- whoogle/rootfs/scripts/00-global_var.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whoogle/rootfs/scripts/00-global_var.sh b/whoogle/rootfs/scripts/00-global_var.sh index a7852a0d8..55611f7e0 100644 --- a/whoogle/rootfs/scripts/00-global_var.sh +++ b/whoogle/rootfs/scripts/00-global_var.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bashio ################################### # Export all addon options as env # From ff5af8b8eb7427c1dc22a074b173fa1d3b142bf6 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 19:34:57 +0100 Subject: [PATCH 21/23] Update repository.json --- repository.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repository.json b/repository.json index 1ba35a80e..4a95259b1 100644 --- a/repository.json +++ b/repository.json @@ -1,5 +1,5 @@ { - "name": "HA Add-ons by alexbelgium for testing ONLY!", - "url": "https://github.com/bruvv/hassio-addons-1", - "maintainer": "bruvv" + "name": "HA Add-ons by alexbelgium", + "url": "https://github.com/alexbelgium/hassio-addons", + "maintainer": "alexbelgium" } From 547501ed30322e0dcaaff3f60e61af41bd54dbb1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 22:34:17 +0100 Subject: [PATCH 22/23] Update CHANGELOG.md --- whoogle/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/whoogle/CHANGELOG.md b/whoogle/CHANGELOG.md index e8baeab26..fbc9b5ee4 100644 --- a/whoogle/CHANGELOG.md +++ b/whoogle/CHANGELOG.md @@ -1,3 +1,5 @@ +- BREAKING change : now configuration is done throigh the addon options + ## 0.7.1 - Changed the config handeling - Added a docs with the config explaination. From 87e386c6007361ba7303fdcf7766fd55a47d56bc Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 2 Jan 2022 22:34:59 +0100 Subject: [PATCH 23/23] Update CHANGELOG.md --- whoogle/CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/whoogle/CHANGELOG.md b/whoogle/CHANGELOG.md index fbc9b5ee4..49c084440 100644 --- a/whoogle/CHANGELOG.md +++ b/whoogle/CHANGELOG.md @@ -1,6 +1,4 @@ -- BREAKING change : now configuration is done throigh the addon options - -## 0.7.1 +- Breaking change - Changed the config handeling - Added a docs with the config explaination. - Make sure you redo your configuration!