diff --git a/.github/workflows/on_issues.yml b/.github/workflows/on_issues.yml index 76de95549..dff92117e 100644 --- a/.github/workflows/on_issues.yml +++ b/.github/workflows/on_issues.yml @@ -29,23 +29,23 @@ jobs: sed -i "/Open Request :/d" "$f"/README.md # If there is an issue with the addon name in title, put a message COUNTER=0 - while [[ $(jq -r --arg COUNTER "$COUNTER" ".["$COUNTER"].title" issueslist) != null ]]; do + while [[ $(jq -r --arg COUNTER "$COUNTER" ".[$COUNTER].title" issueslist) != null ]]; do #Increment counter (( COUNTER=COUNTER+1 )) || true #Get variables - TITLE="$(jq -r --arg COUNTER "$COUNTER" ".["$COUNTER"].title" issueslist)" + TITLE="$(jq -r --arg COUNTER "$COUNTER" ".[$COUNTER].title" issueslist)" TITLE="${TITLE//[<>\$\'\"]/}" #Check if relevant to addon SLUG="$(jq -r --arg f "$f" ".slug" "$f"/config.json)" NAME="$(jq -r --arg f "$f" ".name" "$f"/config.json)" if [[ "${TITLE,,}" == *"${f,,}"* ]] || [[ "${TITLE,,}" == *"${SLUG,,}"* ]] || [[ "${TITLE,,}" == *"${NAME,,}"* ]]; then echo "Project $TITLE, $SLUG, $NAME has an issue" - REQ="$(jq -r --arg COUNTER "$COUNTER" ".["$COUNTER"].user.login" issueslist)" - URL="$(jq -r --arg COUNTER "$COUNTER" ".["$COUNTER"].html_url" issueslist)" - LABEL="$(jq -r --arg COUNTER "$COUNTER" ".["$COUNTER"].labels[].name" issueslist)" - DATEISSUE="$(jq -r --arg COUNTER "$COUNTER" ".["$COUNTER"].created_at" issueslist)" + REQ="$(jq -r --arg COUNTER "$COUNTER" ".[$COUNTER].user.login" issueslist)" + URL="$(jq -r --arg COUNTER "$COUNTER" ".[$COUNTER].html_url" issueslist)" + LABEL="$(jq -r --arg COUNTER "$COUNTER" ".[$COUNTER].labels[].name" issueslist)" + DATEISSUE="$(jq -r --arg COUNTER "$COUNTER" ".[$COUNTER].created_at" issueslist)" DATEISSUE="${DATEISSUE%T*}" if [[ "$LABEL" == *"bug"* ]]; then sed -i "1i ## ⚠ Open Issue : [$TITLE (opened ${DATEISSUE})]($URL) by [@${REQ}](https://github.com/$REQ)" "$f"/README.md diff --git a/.templates/config.template b/.templates/config.template index befabe0d8..ab98829a0 100644 --- a/.templates/config.template +++ b/.templates/config.template @@ -7,6 +7,7 @@ # This file must be filled according to the yaml format. # If the format is invalid, the addon will note an error. # To validate your yaml, you can use the free online tool http://www.yamllint.com/ +# You can use env both for the addon, and for bashio. For bashio, use BASHIO_LOG_LEVEL instead of LOG_LEVEL # EXAMPLE of the format (you need to remove the # for it to become active) # TZ: Europe/Paris diff --git a/.templates/ha_entrypoint.sh b/.templates/ha_entrypoint.sh index e2b4c39ea..01a520bfe 100755 --- a/.templates/ha_entrypoint.sh +++ b/.templates/ha_entrypoint.sh @@ -1,6 +1,5 @@ #!/command/with-contenv bashio # shellcheck shell=bash -set -e echo "Starting..." #################### @@ -31,8 +30,18 @@ for SCRIPTS in /etc/cont-init.d/*; do sed -i "s|$currentshebang|$shebang|g" "$SCRIPTS" fi - # Start the script - /."$SCRIPTS" || echo -e "\033[0;31mError\033[0m : $SCRIPTS exiting $?" + # Use source to share env variables when requested + if [ "${ha_entry_source:-null}" = true ] && command -v "source" &>/dev/null; then + # Exit cannot be used with source + sed -i "s/(.*\s|^)exit ([0-9]+)/\1 return \2 || exit \2/g" "$SCRIPTS" + sed -i "s/bashio::exit.nok/return 1/g" "$SCRIPTS" + sed -i "s/bashio::exit.ok/return 0/g" "$SCRIPTS" + # shellcheck source=/dev/null + source "$SCRIPTS" || echo -e "\033[0;31mError\033[0m : $SCRIPTS exiting $?" + else + # Support for posix only shell + /."$SCRIPTS" || echo -e "\033[0;31mError\033[0m : $SCRIPTS exiting $?" + fi # Cleanup rm "$SCRIPTS" diff --git a/.templates/ha_entrypoint_modif.sh b/.templates/ha_entrypoint_modif.sh index 779c3f642..58012c0db 100755 --- a/.templates/ha_entrypoint_modif.sh +++ b/.templates/ha_entrypoint_modif.sh @@ -46,3 +46,8 @@ done # Define shebang sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh + +# Avoid interference with LOG_LEVEL used in the app +if [ -f /usr/lib/bashio/bashio.sh ]; then + sed -i 's|{LOG_LEVEL:|{BASHIO_LOG_LEVEL:|g' /usr/lib/bashio/bashio.sh +fi diff --git a/addons_updater/rootfs/etc/cont-init.d/99-run.sh b/addons_updater/rootfs/etc/cont-init.d/99-run.sh index 97c63719d..a565c5a60 100755 --- a/addons_updater/rootfs/etc/cont-init.d/99-run.sh +++ b/addons_updater/rootfs/etc/cont-init.d/99-run.sh @@ -203,8 +203,10 @@ for f in */; do # If failure, checks if there is packages that could be used function test_packages () { if [ "$VERBOSE" = true ]; then + # shellcheck disable=SC2086 bashio::log.info "source : $SOURCE and LASTVERSION : $(lastversion "$UPSTREAM" $ARGUMENTS 2>&1 || true)" fi + # shellcheck disable=SC2086 if [[ "$SOURCE" == *"github"* ]] && [[ "$(lastversion "$UPSTREAM" $ARGUMENTS 2>&1 || true)" == *"No release"* ]]; then # Is there a package bashio::log.warning "No version found, looking if packages available" diff --git a/arpspoof/config.json b/arpspoof/config.json index 746e5dcde..2298269f5 100644 --- a/arpspoof/config.json +++ b/arpspoof/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/autobrr/config.json b/autobrr/config.json index 08bbb3cf5..e8535493f 100644 --- a/autobrr/config.json +++ b/autobrr/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/baikal/CHANGELOG.md b/baikal/CHANGELOG.md index e6adafbd5..d76e47053 100644 --- a/baikal/CHANGELOG.md +++ b/baikal/CHANGELOG.md @@ -1,3 +1,5 @@ +### 0.9.4-2 (14-01-2024) +- Minor bugs fixed ## 0.9.4+msmtpfix (30-12-2023) - Update to latest version from ckulka/baikal-docker diff --git a/baikal/config.json b/baikal/config.json index bce9a8c88..d17d66baa 100644 --- a/baikal/config.json +++ b/baikal/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", @@ -74,6 +81,6 @@ "slug": "baikal", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "0.9.4+msmtpfix", + "version": "0.9.4-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" } diff --git a/bazarr/config.json b/bazarr/config.json index e448aa954..3ea51ab7d 100644 --- a/bazarr/config.json +++ b/bazarr/config.json @@ -35,6 +35,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/binance-trading-bot/config.json b/binance-trading-bot/config.json index 379fbd6b2..6729f7d43 100644 --- a/binance-trading-bot/config.json +++ b/binance-trading-bot/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/booksonic_air/config.json b/booksonic_air/config.json index e1168beec..fe232f1fc 100644 --- a/booksonic_air/config.json +++ b/booksonic_air/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/browserless_chrome/config.json b/browserless_chrome/config.json index 50f73a771..12c30fa16 100644 --- a/browserless_chrome/config.json +++ b/browserless_chrome/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/calibre/config.json b/calibre/config.json index 8de235c67..6b034c814 100644 --- a/calibre/config.json +++ b/calibre/config.json @@ -28,6 +28,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/calibre_web/config.json b/calibre_web/config.json index d07310e69..b80c7fe9c 100644 --- a/calibre_web/config.json +++ b/calibre_web/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/cloudcommander/config.json b/cloudcommander/config.json index 42f9765c5..fd4d12009 100644 --- a/cloudcommander/config.json +++ b/cloudcommander/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/code-server/config.json b/code-server/config.json index 4ee518c11..b72684e75 100644 --- a/code-server/config.json +++ b/code-server/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/elasticsearch/config.json b/elasticsearch/config.json index 52efc8764..2a697caad 100644 --- a/elasticsearch/config.json +++ b/elasticsearch/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/emby/config.json b/emby/config.json index d0490eac5..50b4a6d9c 100644 --- a/emby/config.json +++ b/emby/config.json @@ -36,6 +36,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/enedisgateway2mqtt/config.json b/enedisgateway2mqtt/config.json index 1f8c6d60e..f35d3f8d4 100644 --- a/enedisgateway2mqtt/config.json +++ b/enedisgateway2mqtt/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/enedisgateway2mqtt_dev/config.json b/enedisgateway2mqtt_dev/config.json index ef0439d44..8e7a96417 100644 --- a/enedisgateway2mqtt_dev/config.json +++ b/enedisgateway2mqtt_dev/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index 1d565aa83..83f7b514f 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/filebrowser/config.json b/filebrowser/config.json index 31e8fe892..01cef58c9 100644 --- a/filebrowser/config.json +++ b/filebrowser/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/fireflyiii/config.json b/fireflyiii/config.json index f0287a51e..5d5a2d0b6 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json index 08b6ca289..ff16fce59 100644 --- a/fireflyiii_data_importer/config.json +++ b/fireflyiii_data_importer/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/fireflyiii_fints_importer/config.json b/fireflyiii_fints_importer/config.json index 807fb5780..204e24913 100644 --- a/fireflyiii_fints_importer/config.json +++ b/fireflyiii_fints_importer/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/flaresolverr/CHANGELOG.md b/flaresolverr/CHANGELOG.md index dcd5cd94b..84b7d76b7 100644 --- a/flaresolverr/CHANGELOG.md +++ b/flaresolverr/CHANGELOG.md @@ -1,3 +1,5 @@ +### 3.3.13-2 (15-01-2024) +- Correct healthcheck endpoint (thanks @override80) ## 3.3.13 (13-01-2024) - Update to latest version from FlareSolverr/FlareSolverr diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 9d696baa3..5e5c814ec 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -103,7 +103,7 @@ LABEL \ ################# ENV HEALTH_PORT="8191" \ - HEALTH_URL="" + HEALTH_URL="/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ diff --git a/flaresolverr/config.json b/flaresolverr/config.json index b5a09e38c..e4a7fb37e 100644 --- a/flaresolverr/config.json +++ b/flaresolverr/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", @@ -69,6 +76,6 @@ "slug": "flaresolverr", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.3.13", + "version": "3.3.13-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8191]" } diff --git a/flexget/config.json b/flexget/config.json index 4452cf090..b925cdbc9 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/free_games_claimer/config.json b/free_games_claimer/config.json index 2e9b38f44..c9109bbd0 100644 --- a/free_games_claimer/config.json +++ b/free_games_claimer/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/gazpar2mqtt/config.json b/gazpar2mqtt/config.json index 27ee88acb..c3c471514 100644 --- a/gazpar2mqtt/config.json +++ b/gazpar2mqtt/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/gitea/config.json b/gitea/config.json index 7838d4e00..60ead273a 100644 --- a/gitea/config.json +++ b/gitea/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/grav/config.json b/grav/config.json index 10f7001a8..61b21e041 100644 --- a/grav/config.json +++ b/grav/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/guacamole/config.json b/guacamole/config.json index 93e725115..7a5e7f092 100644 --- a/guacamole/config.json +++ b/guacamole/config.json @@ -28,6 +28,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/immich/config.json b/immich/config.json index fd0d5f931..518022a56 100644 --- a/immich/config.json +++ b/immich/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/inadyn/config.json b/inadyn/config.json index 483f41efc..0c25cfc65 100644 --- a/inadyn/config.json +++ b/inadyn/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/jackett/config.json b/jackett/config.json index 6f8d57c89..b9029e61d 100644 --- a/jackett/config.json +++ b/jackett/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/jellyfin/config.json b/jellyfin/config.json index 58ae25e66..64d21ff9f 100644 --- a/jellyfin/config.json +++ b/jellyfin/config.json @@ -36,6 +36,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/jellyseerr/config.json b/jellyseerr/config.json index c627768e8..d612764fa 100644 --- a/jellyseerr/config.json +++ b/jellyseerr/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/joplin/config.json b/joplin/config.json index f0c14da6c..a514d0351 100644 --- a/joplin/config.json +++ b/joplin/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/lidarr/config.json b/lidarr/config.json index 71ff5b1a0..78f098ac6 100644 --- a/lidarr/config.json +++ b/lidarr/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/mealie/README.md b/mealie/README.md index 33520eb1a..c241a2cbd 100644 --- a/mealie/README.md +++ b/mealie/README.md @@ -1,4 +1,5 @@ ## ⚠ Open Request : [✨ [REQUEST] Mealie Ingress Support (opened 2023-11-05)](https://github.com/alexbelgium/hassio-addons/issues/1061) by [@minmaxat](https://github.com/minmaxat) +## ⚠ Open Request : [✨ [REQUEST] Mealie (Omni) (opened 2024-01-14)](https://github.com/alexbelgium/hassio-addons/issues/1179) by [@LoganJFisher](https://github.com/LoganJFisher) # Hass.io Add-ons: Mealie [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/mealie/config.json b/mealie/config.json index 0bf64b586..9075d57eb 100644 --- a/mealie/config.json +++ b/mealie/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/mylar3/config.json b/mylar3/config.json index 50e813cdd..d26405506 100644 --- a/mylar3/config.json +++ b/mylar3/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index 54a8b9646..45f395e68 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,3 +1,7 @@ +### 28.0.1-6 (14-01-2024) +- Minor bugs fixed +### 28.0.1-5 (14-01-2024) +- Minor bugs fixed ### 28.0.1-4 (12-01-2024) - Fix : webui won't start https://github.com/alexbelgium/hassio-addons/issues/1170 https://github.com/alexbelgium/hassio-addons/issues/1171 diff --git a/nextcloud/README.md b/nextcloud/README.md index 731d88fba..63fe7852d 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Request : [✨ [REQUEST] NextCloud allow iFrame (opened 2024-01-15)](https://github.com/alexbelgium/hassio-addons/issues/1182) by [@ymurawski](https://github.com/ymurawski) # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/nextcloud/config.json b/nextcloud/config.json index a690c2a2d..e712a59bf 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -33,6 +33,20 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", @@ -135,6 +149,6 @@ "uart": true, "udev": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "28.0.1-4", + "version": "28.0.1-6", "webui": "https://[HOST]:[PORT:443]" } diff --git a/nzbget/config.json b/nzbget/config.json index 9e1a65721..47518e133 100644 --- a/nzbget/config.json +++ b/nzbget/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/omada/config.json b/omada/config.json index e80d66baa..f031a7a03 100644 --- a/omada/config.json +++ b/omada/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/omada_v3/config.json b/omada_v3/config.json index 9f7b6d810..31d3fa69f 100644 --- a/omada_v3/config.json +++ b/omada_v3/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/ombi/config.json b/ombi/config.json index 0aa44a9a4..cace8865e 100644 --- a/ombi/config.json +++ b/ombi/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/organizr/config.json b/organizr/config.json index 862618cfe..3082d92f5 100644 --- a/organizr/config.json +++ b/organizr/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/overseerr/config.json b/overseerr/config.json index 37456edb4..43d38dc39 100644 --- a/overseerr/config.json +++ b/overseerr/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md index 18e499901..3d858c066 100644 --- a/paperless_ngx/CHANGELOG.md +++ b/paperless_ngx/CHANGELOG.md @@ -1,3 +1,4 @@ +### 2.3.3-4 (13-01-2024) - Tentative fix : paperless not starting https://github.com/alexbelgium/hassio-addons/issues/1178 ## 2.3.3 (13-01-2024) diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 5178e2030..d647a303c 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -66,7 +66,7 @@ RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif. # Add custom scripts RUN sed -i "2a source /ha_entrypoint.sh" /sbin/docker-entrypoint.sh && \ - sed -i "s=/./=source /=g" /ha_entrypoint.sh && \ + sed -i "s=/\.=source =g" /ha_entrypoint.sh && \ sed -i "s=env bash=env bashio=g" /sbin/docker-entrypoint.sh RUN \ diff --git a/paperless_ngx/README.md b/paperless_ngx/README.md index be91900b2..25618ea76 100644 --- a/paperless_ngx/README.md +++ b/paperless_ngx/README.md @@ -22,6 +22,8 @@ _Thanks to everyone having starred my repo! To star it click on the image below, [Paperless NGX](https://github.com/paperless-ngx/paperless-ngx) is a document management system that transforms your physical documents into a searchable online archive so you can keep, well, less paper. +Alternative quality addon : https://github.com/BenoitAnastay/home-assistant-addons-repository/tree/main/paperless-ngx + ## Configuration Default username:password is admin:admin. Once logged in, you can change it from within the administration panel. diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index 9759721a5..4a76055f3 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", @@ -126,6 +133,6 @@ "slug": "paperless_ng", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.3.3-2", + "version": "2.3.3-4", "webui": "http://[HOST]:[PORT:8000]" } diff --git a/papermerge/config.json b/papermerge/config.json index 50d12c23f..e046d084e 100644 --- a/papermerge/config.json +++ b/papermerge/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/photoprism/config.json b/photoprism/config.json index e96c2b757..859e2d57a 100644 --- a/photoprism/config.json +++ b/photoprism/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/piwigo/config.json b/piwigo/config.json index e77447a4e..de88ac9b2 100644 --- a/piwigo/config.json +++ b/piwigo/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/plex/config.json b/plex/config.json index a04700091..5efe42b6d 100644 --- a/plex/config.json +++ b/plex/config.json @@ -37,6 +37,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/plex_meta_manager/config.json b/plex_meta_manager/config.json index 178e04bb8..ad4df33ac 100644 --- a/plex_meta_manager/config.json +++ b/plex_meta_manager/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/portainer_agent/config.json b/portainer_agent/config.json index 84f704515..df7538b48 100644 --- a/portainer_agent/config.json +++ b/portainer_agent/config.json @@ -45,5 +45,5 @@ "slug": "portainer_agent", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "windowsltsc2022-amd64-2.19.4" + "version": "2.19.4" } diff --git a/portainer_agent/updater.json b/portainer_agent/updater.json index 2a7b2bae1..e5b375da2 100644 --- a/portainer_agent/updater.json +++ b/portainer_agent/updater.json @@ -1,6 +1,7 @@ { "last_update": "09-12-2023", "repository": "alexbelgium/hassio-addons", + "github_tagfilter": "alpine", "slug": "portainer_agent", "source": "dockerhub", "upstream_repo": "portainer/agent", diff --git a/prowlarr/config.json b/prowlarr/config.json index 05a7d0e2d..bdc4776bf 100644 --- a/prowlarr/config.json +++ b/prowlarr/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index f14b15ddd..a11d36312 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -3,7 +3,7 @@ ### 4.6.2_42 (12-01-2024) - Fix : failure to install custom webUI https://github.com/alexbelgium/hassio-addons/issues/1172 (thanks @akrigator) -- [qbit_manage] : switch to develop +- [qbit_manage] : switch to develop ### 4.6.2_40 (31-12-2023) - Minor bugs fixed diff --git a/qbittorrent/config.json b/qbittorrent/config.json index 6b75a0ace..f1c7cc3a6 100644 --- a/qbittorrent/config.json +++ b/qbittorrent/config.json @@ -32,6 +32,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh index 05a5dbc12..59778c7d7 100755 --- a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh @@ -17,6 +17,10 @@ if bashio::config.true 'openvpn_enabled'; then # Get current ip curl -s ipecho.net/plain > /currentip + # Create symlink for files + rm -r /etc/openvpn + ln -s /config/openvpn /etc/openvpn + # Function to check for files path function check_path () { @@ -56,7 +60,7 @@ if bashio::config.true 'openvpn_enabled'; then # Check if the line contains a txt file ####################################### - if [[ ! $line =~ ^"#" ]] && [[ ! $line =~ ^";" ]] && [[ "$line" =~ \.txt ]] || [[ "$line" =~ \.crt ]] || [[ "$line" == "auth-user-pass"* ]]; then + if [[ ! $line =~ ^"#" ]] && [[ ! $line =~ ^";" ]] && [[ "$line" == *" "*"."* ]] || [[ "$line" == "auth-user-pass"* ]]; then # Extract the txt file name from the line file_name="$(echo "$line" | awk -F' ' '{print $2}')" # Check if the txt file exists diff --git a/qbittorrent/rootfs/etc/cont-init.d/93-wg_test.sh b/qbittorrent/rootfs/etc/cont-init.d/93-wg_test.sh new file mode 100644 index 000000000..0d4d63e3e --- /dev/null +++ b/qbittorrent/rootfs/etc/cont-init.d/93-wg_test.sh @@ -0,0 +1,185 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +set -e + +######################################################## +# DRAFT : Start wireguard if needed +######################################################## + +QBT_CONFIG_FILE="/config/qBittorrent/qBittorrent.conf" + +################# +# SET VARIABLES # +################# + +# Ensure single vpn +if bashio::config.true 'openvpn_enabled' && bashio::config.true 'wireguard_enabled'; then + bashio::log.warning "Both openvpn_enabled and wireguard_enabled are set. Openvpn configuration will be used" + bashio::addon.option 'wireguard_enabled' false +fi + +# Set variables +if bashio::config.true 'wireguard_enabled'; then + vpn="wireguard" + vpn_ending=".conf" + vpn_interface="wg0" +fi + +# Permissions +chmod 755 /config/openvpn/* +chmod 755 /config/wireguard/* + +################# +# CONFIGURE VPN # +################# + +if bashio::config.true 'wireguard_enabled'; then + + ############ + # MESSAGES # + ############ + + bashio::log.info "----------------------------" + bashio::log.info "${vpn} enabled, configuring" + bashio::log.info "----------------------------" + + # Get current ip + curl -s ipecho.net/plain >/currentip + + #################### + # CONFIG SELECTION # + #################### + + # If openvpn_config option used + if bashio::config.has_value "openvpn_config"; then + openvpn_config=$(bashio::config 'openvpn_config') + # If file found + if [ -f /config/"${vpn}"/"${openvpn_config}" ]; then + # If correct type + if [[ "${openvpn_config}" == *"${vpn_ending}" ]]; then + echo "... configured config file : using /addon_configs/$HOSTNAME/${vpn}/${openvpn_config}" + else + bashio::exit.nok "Configured ${vpn_ending} file : ${openvpn_config} is set but does not end by ${vpn_ending} ; it can't be used!" + fi + else + bashio::exit.nok "Configured ${vpn_ending} file : ${openvpn_config} not found! Are you sure you added it in /addon_configs/$HOSTNAME/${vpn} using the Filebrowser addon ?" + fi + # If openvpn_config not set, but folder is not empty + elif ls /config/"${vpn}"/*"${vpn_ending}" >/dev/null 2>&1; then + # Look for openvpn files + # Wildcard search for openvpn config files and store results in array + mapfile -t VPN_CONFIGS < <(find /config/"${vpn}" -maxdepth 1 -name "*${vpn_ending}" -print) + # Choose random config + VPN_CONFIG="${VPN_CONFIGS[$RANDOM % ${#VPN_CONFIGS[@]}]}" + # Get the VPN_CONFIG name without the path and extension + openvpn_config="${VPN_CONFIG##*/}" + echo "... ${vpn} enabled, but openvpn_config option empty. Selecting a random ${vpn_ending} file : ${openvpn_config}. Other available files :" + printf '%s\n' "${VPN_CONFIGS[@]}" + # If openvpn_enabled set, config not set, and openvpn folder empty + else + bashio::exit.nok "_enabled is set, however, your ${vpn} folder is empty ! Are you sure you added it in /addon_configs/$HOSTNAME/ using the Filebrowser addon ?" + fi + + # Send to script + sed -i "s|/config/${vpn}/config${vpn_ending}|/config/${vpn}/${openvpn_config}|g" /etc/s6-overlay/s6-rc.d/svc-qbittorrent/run + + ####################### + # WIREGUARD SPECIFICS # + ####################### + + if [[ "$vpn" == "wireguard" ]]; then + echo "wireguard" + + # Set interface name + vpn_interface="${openvpn_config%.*}" + + # Set gateway + DEFAULT_IPV4_GATEWAY=$(ip -4 route list 0/0 | cut -d ' ' -f 3 | head -n 1) + + # Route WebUI traffic over "$DEFAULT_IPV4_GATEWAY" + mkdir -p /etc/iproute2/ + echo "8080 webui" >> /etc/iproute2/rt_tables + if [ -n "$DEFAULT_IPV4_GATEWAY" ]; then + # Default + ip rule add fwmark 8080 table webui + ip route add default via "$DEFAULT_IPV4_GATEWAY" table webui + # Look for local networks first + ip rule add fwmark 8080 table main suppress_prefixlength 1 + fi + + # Ensure ingress is allowed in allowed_ips + allowed_ips="$(sed -n "/AllowedIPs/p" /config/wireguard/"${openvpn_config}")" + allowed_ips="${allowed_ips//*=}" + # Use comma as separator and read into an array + IFS=',' read -ra ADDR <<< "$allowed_ips" + # Initialize an empty array to hold the filtered elements + filtered=() + # Loop over the elements + for i in "${ADDR[@]}" 127.0.0.1 10.0.0.0/8 192.168.0.0/16 172.16.0.0/12 172.30.0.0/16; do + # If the element does not contain "::", add it to the filtered array + if [[ $i != *::* ]]; then + filtered+=("$i") + fi + done + filtered=("$(echo "${filtered[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')") + # Join the filtered elements with commas and store in a variable + allowed_ips=$(IFS=', '; echo "${filtered[*]}") + # Store it in the conf file + sed -i "/^AllowedIPs/c AllowedIPs=$allowed_ips" /config/wireguard/"${openvpn_config}" + + fi + + ################### + # Accept local ip # + ################### + + ip route add 10.0.0.0/8 via 172.30.32.1 || true + ip route add 192.168.0.0/16 via 172.30.32.1 || true + ip route add 172.16.0.0/12 via 172.30.32.1 || true + ip route add 172.30.0.0/16 via 172.30.32.1 || true + + ################## + # CONFIGURE QBIT # + ################## + + echo "... $vpn correctly set, qbittorrent will run tunnelled" + + # Connection with interface binding + echo "Using interface binding in the qBittorrent app" + + # Define preferences line + cd /config/qBittorrent/ || exit 1 + + # If qBittorrent.conf exists + if [ -f "$QBT_CONFIG_FILE" ]; then + # Remove previous line and bind tun0 + echo "... deleting previous interface settings" + sed -i '/Interface/d' "$QBT_CONFIG_FILE" + + # Bind tun0 + echo "... binding ${vpn_interface} interface in qBittorrent configuration" + sed -i "/\[Preferences\]/ i\Connection\\\Interface=${vpn_interface}" "$QBT_CONFIG_FILE" + sed -i "/\[Preferences\]/ i\Connection\\\InterfaceName=${vpn_interface}" "$QBT_CONFIG_FILE" + + # Add to ongoing session + sed -i "/\[BitTorrent\]/a \Session\\\Interface=${vpn_interface}" "$QBT_CONFIG_FILE" + sed -i "/\[BitTorrent\]/a \Session\\\InterfaceName=${vpn_interface}" "$QBT_CONFIG_FILE" + + else + bashio::log.error "qBittorrent config file doesn't exist, openvpn must be added manually to qbittorrent options " + exit 1 + fi + +elif ! bashio::config.true 'openvpn_enabled'; then + + ################## + # REMOVE OPENVPN # + ################## + + # Ensure no redirection by removing the direction tag + if [ -f "$QBT_CONFIG_FILE" ]; then + sed -i '/Interface/d' "$QBT_CONFIG_FILE" + fi + bashio::log.info "Direct connection without VPN enabled" + +fi diff --git a/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run b/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run index 490bb2949..b4c26a186 100644 --- a/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run +++ b/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run @@ -10,6 +10,13 @@ fi if bashio::config.true 'openvpn_enabled'; then exec /usr/sbin/openvpn --config /config/openvpn/config.ovpn --script-security 2 --up /etc/openvpn/up.sh --down /etc/openvpn/down.sh --pull-filter ignore "route-ipv6" --pull-filter ignore "ifconfig-ipv6" --pull-filter ignore "tun-ipv6" --pull-filter ignore "redirect-gateway ipv6" --pull-filter ignore "dhcp-option DNS6" else + ######################################################## + # DRAFT : Start wireguard if needed + if bashio::config.true 'wireguard_enabled'; then + wg-quick up /config/wireguard/config.conf & true + fi + ######################################################## + if bashio::config.true 'silent'; then exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \ diff --git a/qbittorrent/rootfs/etc/services.d/nginx/run b/qbittorrent/rootfs/etc/services.d/nginx/run index fc0006275..8e38308bf 100644 --- a/qbittorrent/rootfs/etc/services.d/nginx/run +++ b/qbittorrent/rootfs/etc/services.d/nginx/run @@ -13,7 +13,7 @@ if [ -f /currentip ]; then exec nginx || nginx -s reload & \ while true; do # Get vpn ip - if bashio::config.true 'openvpn_alt_mode'; then + if ! bashio::config.true 'wireguard_enabled' && bashio::config.true 'openvpn_alt_mode'; then curl -s ipecho.net/plain > /vpnip else curl -s ipecho.net/plain --interface tun0 > /vpnip diff --git a/radarr/config.json b/radarr/config.json index 079aaa733..a9bbf7652 100644 --- a/radarr/config.json +++ b/radarr/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/readarr/config.json b/readarr/config.json index 75e51ca0d..fa4dd6c26 100644 --- a/readarr/config.json +++ b/readarr/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/requestrr/config.json b/requestrr/config.json index 4be0b554c..571c5680d 100644 --- a/requestrr/config.json +++ b/requestrr/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/resiliosync/config.json b/resiliosync/config.json index 4e7556e45..74ed00b9e 100644 --- a/resiliosync/config.json +++ b/resiliosync/config.json @@ -31,6 +31,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/sabnzbd/config.json b/sabnzbd/config.json index 0edbc8972..db934d8d8 100644 --- a/sabnzbd/config.json +++ b/sabnzbd/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/scrutiny/config.json b/scrutiny/config.json index bbe782411..54d3564d2 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/seafile/README.md b/seafile/README.md index a2659ea81..1d108c426 100644 --- a/seafile/README.md +++ b/seafile/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Request : [✨ [REQUEST] Seafile: enble WebDAV (opened 2023-09-18)](https://github.com/alexbelgium/hassio-addons/issues/991) by [@stepler-nn](https://github.com/stepler-nn) # Home assistant add-on: seafile [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/seafile/config.json b/seafile/config.json index 6e273bf5e..b906f08ca 100644 --- a/seafile/config.json +++ b/seafile/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/sonarr/config.json b/sonarr/config.json index d371b6c13..f331332dd 100644 --- a/sonarr/config.json +++ b/sonarr/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index c64ec905c..cd99f6af1 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/tdarr/config.json b/tdarr/config.json index 407a66963..668aff167 100644 --- a/tdarr/config.json +++ b/tdarr/config.json @@ -37,6 +37,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/transmission/config.json b/transmission/config.json index de67f85b4..4143af13c 100644 --- a/transmission/config.json +++ b/transmission/config.json @@ -31,6 +31,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/transmission_openvpn/config.json b/transmission_openvpn/config.json index 04ab10cc2..1441022b2 100644 --- a/transmission_openvpn/config.json +++ b/transmission_openvpn/config.json @@ -31,6 +31,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/ubooquity/config.json b/ubooquity/config.json index 80acf2730..aab8b2fc5 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/unpackerr/config.json b/unpackerr/config.json index a0d04bc42..a3e606a3f 100644 --- a/unpackerr/config.json +++ b/unpackerr/config.json @@ -29,6 +29,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 81d9fb273..8dd10cc8e 100644 --- a/webtop_kde/config.json +++ b/webtop_kde/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/webtrees/config.json b/webtrees/config.json index f558b2d50..66d26a904 100644 --- a/webtrees/config.json +++ b/webtrees/config.json @@ -31,6 +31,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/whoogle/config.json b/whoogle/config.json index dd556550e..28e2b9735 100644 --- a/whoogle/config.json +++ b/whoogle/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1", diff --git a/zoneminder/config.json b/zoneminder/config.json index b1f891581..cc2585e0a 100644 --- a/zoneminder/config.json +++ b/zoneminder/config.json @@ -30,6 +30,13 @@ "/dev/nvme", "/dev/nvme0n1p1", "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme3n1p3", "/dev/mmcblk", "/dev/fuse", "/dev/sda1",