Merge branch 'alexbelgium:master' into master

This commit is contained in:
lorenzo farnararo
2023-12-30 14:51:54 +01:00
committed by GitHub
77 changed files with 335 additions and 173 deletions

View File

@@ -29,9 +29,14 @@ jobs:
with:
filters: .github/paths-filter.yml
make-executable:
correct-CRLF:
if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
needs: check-addon-changes
uses: ./.github/workflows/weekly_crlftolf.yaml
make-executable:
if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
needs: [check-addon-changes, correct-CRLF]
runs-on: ubuntu-latest
strategy:
fail-fast: false
@@ -74,7 +79,7 @@ jobs:
build:
if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
needs: [check-addon-changes, make-executable]
needs: [check-addon-changes, make-executable, correct-CRLF]
runs-on: ubuntu-latest
environment: CR_PAT
name: Build ${{ matrix.arch }} ${{ matrix.addon }} add-on

View File

@@ -3,9 +3,9 @@
# This workflow finds and fixes CRLF endings in a repository
name: Fix CRLF Endings
on:
push: # Trigger the workflow on push event
workflow_call:
workflow_dispatch:
jobs:
fix-crlf:
name: Fix CRLF Endings
@@ -27,15 +27,13 @@ jobs:
- name: Apply dos2unix to files with CRLF endings
run: |
# Loop through each file and apply dos2unix
# shellcheck disable=SC2043
for f in ${{ steps.check-crlf.outputs.files }}; do
# Apply dos2unix and keep the original timestamp
dos2unix -k "$f"
done
- name: Create a pull request with the fixed files
uses: peter-evans/create-pull-request@v5 # Use the create-pull-request action
- name: Commit if needed
uses: EndBug/add-and-commit@v9
with:
# Specify the pull request details
title: Fix CRLF Endings
commit-message: Apply dos2unix to files with CRLF endings
branch: fix-crlf-endings
delete-branch: true
message: "Github bot : CRLF corrected"
default_author: github_actions

View File

@@ -22,18 +22,30 @@ else
mkdir -p /config/addons_autoscripts
fi
bashio::log.green "Execute $CONFIGLOCATION/${slug}.sh if existing"
bashio::log.green "---------------------------------------------------------"
bashio::log.green "If accessing the file with filebrowser it should be mapped to $CONFIGFILEBROWSER/${slug}.sh"
bashio::log.green "Execute $CONFIGFILEBROWSER/${slug}.sh if existing"
bashio::log.green "Wiki here : github.com/alexbelgium/hassio-addons/wiki/Add-ons-feature-:-customisation"
# Execute scripts
if [ -f "$CONFIGLOCATION/${slug}".sh ]; then
bashio::log.green "... script found, executing"
# Convert scripts to linux
dos2unix "$CONFIGLOCATION/${slug}".sh || true
chmod +x "$CONFIGLOCATION/${slug}".sh || true
/."$CONFIGLOCATION/${slug}".sh
else
bashio::log.green "... no script found, exiting"
# Download template if no script found and exit
if [ ! -f "$CONFIGLOCATION/${slug}".sh ]; then
TEMPLATESOURCE="https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/script.template"
curl -f -L -s -S "$TEMPLATESOURCE" --output "$CONFIGLOCATION/${slug}".sh
exit 0
fi
# Convert scripts to linux
dos2unix "$CONFIGLOCATION/${slug}".sh &>/dev/null || true
chmod +x "$CONFIGLOCATION/${slug}".sh
# Check if there is actual commands
while IFS= read -r line
do
# Remove leading and trailing whitespaces
line="$(echo "$line" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
# Check if line is not empty and does not start with #
if [[ -n "$line" ]] && [[ ! "$line" =~ ^# ]]; then
bashio::log.green "... script found, executing"
/."$CONFIGLOCATION/${slug}".sh
exit 0
fi
done < "$CONFIGLOCATION/${slug}".sh

View File

@@ -40,8 +40,8 @@ done
# Send crond logs to addon logs
if [ -f /etc/s6-overlay/s6-rc.d/svc-cron/run ]; then
sed -i "/exec busybox crond/c exec busybox crond -f -L /proc/1/fd/1 -S -l 5" /etc/s6-overlay/s6-rc.d/svc-cron/run
sed -i "/exec \/usr\/sbin\/cron/c exec /usr/sbin/cron -f -L /proc/1/fd/1 5" /etc/s6-overlay/s6-rc.d/svc-cron/run
sed -i "/exec busybox crond/c exec busybox crond -f -S -L /proc/1/fd/1" /etc/s6-overlay/s6-rc.d/svc-cron/run
sed -i "/exec \/usr\/sbin\/cron/c exec /usr/sbin/cron -f &>/proc/1/fd/1" /etc/s6-overlay/s6-rc.d/svc-cron/run
fi
# Replace lsiown if not found

View File

@@ -0,0 +1,9 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
#################
# CODE INJECTOR #
#################
# Any commands written in this bash script will be executed at addon start
# See guide here : https://github.com/alexbelgium/hassio-addons/wiki/Add%E2%80%90ons-feature-:-customisation

View File

@@ -1,4 +1,7 @@
## 0.9.4+msmtpfix (30-12-2023)
- Update to latest version from ckulka/baikal-docker
## 0.9.4 (23-12-2023)
- Update to latest version from ckulka/baikal-docker

View File

@@ -16,7 +16,7 @@
ARG BUILD_FROM
ARG BUILD_VERSION
ARG BUILD_UPSTREAM="0.9.4"
ARG BUILD_UPSTREAM="0.9.4+msmtpfix"
FROM ${BUILD_FROM}
##################

View File

@@ -74,6 +74,6 @@
"slug": "baikal",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "0.9.4",
"version": "0.9.4+msmtpfix",
"webui": "[PROTO:ssl]://[HOST]:[PORT:80]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "baikal",
"source": "github",
"upstream_repo": "ckulka/baikal-docker",
"upstream_version": "0.9.4"
"upstream_version": "0.9.4+msmtpfix"
}

View File

@@ -1,4 +1,10 @@
## 4.8.0.65 (30-12-2023)
- Update to latest version from linuxserver/docker-emby
## 4.8.0.64 (30-12-2023)
- Update to latest version from linuxserver/docker-emby
## 4.8.0.63 (23-12-2023)
- Update to latest version from linuxserver/docker-emby

View File

@@ -16,7 +16,7 @@
ARG BUILD_FROM
ARG BUILD_VERSION
ARG BUILD_UPSTREAM="4.8.0.63"
ARG BUILD_UPSTREAM="4.8.0.65"
FROM ${BUILD_FROM}
##################

View File

@@ -114,6 +114,6 @@
"slug": "emby_nas",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby",
"version": "4.8.0.63",
"version": "4.8.0.65",
"video": true
}

View File

@@ -1,9 +1,9 @@
{
"github_beta": "true",
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "emby",
"source": "github",
"upstream_repo": "linuxserver/docker-emby",
"upstream_version": "4.8.0.63"
"upstream_version": "4.8.0.65"
}

View File

@@ -1,4 +1,7 @@
## 0.9.4b3 (30-12-2023)
- Update to latest version from m4dm4rtig4n/myelectricaldata
## 0.9.4b1 (23-12-2023)
- Update to latest version from m4dm4rtig4n/myelectricaldata

View File

@@ -89,5 +89,5 @@
"slug": "enedisgateway2mqtt_dev",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "0.9.4b1"
"version": "0.9.4b3"
}

View File

@@ -1,9 +1,9 @@
{
"github_beta": "true",
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "enedisgateway2mqtt",
"source": "github",
"upstream_repo": "m4dm4rtig4n/myelectricaldata",
"upstream_version": "0.9.4b1"
"upstream_version": "0.9.4b3"
}

View File

@@ -1,3 +1,6 @@
- Fix : correct cache for thumbnails creation
- Feat : new option to disable thumbnails (set disable_thumbnails to true)
### 2.23.0_8 (20-12-2023)
- Minor bugs fixed
- Update of global scripts

View File

@@ -16,7 +16,6 @@
ARG BUILD_FROM
ARG BUILD_VERSION
ARG BUILD_UPSTREAM="2.25.0"
FROM ${BUILD_FROM}
##################

View File

@@ -101,10 +101,10 @@
"cifsdomain": "str?",
"cifspassword": "str?",
"cifsusername": "str?",
"disable_thumbnails": "bool?",
"keyfile": "str",
"localdisks": "str?",
"networkdisks": "str?",
"smbv1": "bool?",
"ssl": "bool"
},
"slug": "filebrowser",

View File

@@ -91,13 +91,19 @@ else
BASE_FOLDER=/
fi
if bashio::config.has_value 'disable_thumbnails'; then
DISABLE_THUMBNAILS=" --disable-thumbnails"
else
DISABLE_THUMBNAILS=""
fi
bashio::log.info "Starting..."
# Remove default config
rm /.filebrowser.json
# shellcheck disable=SC2086
/./filebrowser --disable-preview-resize --disable-type-detection-by-header --cache-dir=".\cache" $CERTFILE $KEYFILE --root="$BASE_FOLDER" --address=0.0.0.0 --port=8080 --database=/config/filebrowser.dB "$NOAUTH" &
/./filebrowser --disable-preview-resize --disable-type-detection-by-header --cache-dir="/cache" $CERTFILE $KEYFILE --root="$BASE_FOLDER" --address=0.0.0.0 --port=8080 --database=/config/filebrowser.dB "$NOAUTH" "$DISABLE_THUMBNAILS" &
bashio::net.wait_for 8080 localhost 900 || true
bashio::log.info "Started !"
exec nginx

View File

@@ -1,4 +1,7 @@
## 6.1.1 (30-12-2023)
- Update to latest version from firefly-iii/firefly-iii
## 6.1.0 (23-12-2023)
- Update to latest version from firefly-iii/firefly-iii

View File

@@ -34,7 +34,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# # Change data location
# grep -rl "/var/www/html" /etc/ | xargs sed -i 's|/var/www/html|/data/firefly|g'
ARG BUILD_UPSTREAM="6.1.0"
ARG BUILD_UPSTREAM="6.1.1"
RUN \
# Change upload folder to "ha_upload" since the default one is binded to a volume (see base image)
sed -i "s/'root' => storage_path('upload'),/'root' => storage_path('ha_upload'),/g" /var/www/html/config/filesystems.php

View File

@@ -99,6 +99,6 @@
"startup": "services",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "6.1.0",
"version": "6.1.1",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "fireflyiii",
"source": "github",
"upstream_repo": "firefly-iii/firefly-iii",
"upstream_version": "6.1.0"
"upstream_version": "6.1.1"
}

View File

@@ -1,4 +1,7 @@
## 3.11.3 (30-12-2023)
- Update to latest version from wiserain/flexget
## 3.10.6 (16-12-2023)
- Update to latest version from wiserain/flexget

View File

@@ -90,6 +90,6 @@
"slug": "flexget",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "3.10.6",
"version": "3.11.3",
"webui": "[PROTO:ssl]://[HOST]:[PORT:5050]"
}

View File

@@ -1,9 +1,9 @@
{
"dockerhub_list_size": "10",
"last_update": "16-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "flexget",
"source": "dockerhub",
"upstream_repo": "wiserain/flexget",
"upstream_version": "3.10.6"
"upstream_version": "3.11.3"
}

View File

@@ -1,4 +1,7 @@
## 1.6 (30-12-2023)
- Update to latest version from vogler/free-games-claimer
## 1.5 (04-11-2023)
- Update to latest version from vogler/free-games-claimer

View File

@@ -85,6 +85,6 @@
"slug": "free_games_claimer",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "1.5-3",
"version": "1.6",
"webui": "[PROTO:ssl]://[HOST]:[PORT:6080]"
}

View File

@@ -1,10 +1,10 @@
{
"dockerhub_by_date": true,
"dockerhub_list_size": 2,
"last_update": "04-11-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "free_games_claimer",
"source": "github",
"upstream_repo": "vogler/free-games-claimer",
"upstream_version": "1.5"
"upstream_version": "1.6"
}

View File

@@ -1,4 +1,10 @@
## 0.21.1461 (30-12-2023)
- Update to latest version from linuxserver/docker-jackett
## 0.21.1454 (30-12-2023)
- Update to latest version from linuxserver/docker-jackett
## 0.21.1437 (23-12-2023)
- Update to latest version from linuxserver/docker-jackett

View File

@@ -100,6 +100,6 @@
"slug": "jackett_nas",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett",
"version": "0.21.1437",
"version": "0.21.1461",
"webui": "http://[HOST]:[PORT:9117]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "jackett",
"source": "github",
"upstream_repo": "linuxserver/docker-jackett",
"upstream_version": "0.21.1437"
"upstream_version": "0.21.1461"
}

View File

@@ -1,4 +1,7 @@
## 0.7.7 (30-12-2023)
- Update to latest version from linuxserver/docker-mylar3
## 0.7.6 (19-11-2023)
- Update to latest version from linuxserver/docker-mylar3

View File

@@ -97,6 +97,6 @@
"slug": "mylar3",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "0.7.6-3",
"version": "0.7.7",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8090]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "19-11-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "mylar3",
"source": "github",
"upstream_repo": "linuxserver/docker-mylar3",
"upstream_version": "0.7.6"
"upstream_version": "0.7.7"
}

View File

@@ -1,4 +1,7 @@
## 28.0.1 (30-12-2023)
- Update to latest version from linuxserver/docker-nextcloud
## 28.0.0 (16-12-2023)
- Update to latest version from linuxserver/docker-nextcloud
### 27.1.4-6 (07-12-2023)

View File

@@ -135,6 +135,6 @@
"uart": true,
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud",
"version": "28.0.0",
"version": "28.0.1",
"webui": "https://[HOST]:[PORT:443]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "16-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "nextcloud",
"source": "github",
"upstream_repo": "linuxserver/docker-nextcloud",
"upstream_version": "28.0.0"
"upstream_version": "28.0.1"
}

View File

@@ -1,4 +1,7 @@
## 2.2.1 (30-12-2023)
- Update to latest version from paperless-ngx/paperless-ngx
## 2.1.3 (23-12-2023)
- Update to latest version from paperless-ngx/paperless-ngx

View File

@@ -126,6 +126,6 @@
"slug": "paperless_ng",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "2.1.3",
"version": "2.2.1",
"webui": "http://[HOST]:[PORT:8000]"
}

View File

@@ -1,10 +1,10 @@
{
"github_beta": "false",
"github_fulltag": "false",
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "paperless_ng",
"source": "github",
"upstream_repo": "paperless-ngx/paperless-ngx",
"upstream_version": "2.1.3"
"upstream_version": "2.2.1"
}

View File

@@ -1,4 +1,7 @@
## 14.1.0 (30-12-2023)
- Update to latest version from linuxserver/docker-piwigo
## 14.0.0 (16-12-2023)
- Update to latest version from linuxserver/docker-piwigo

View File

@@ -97,6 +97,6 @@
"slug": "piwigo",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "14.0.0",
"version": "14.1.0",
"webui": "[PROTO:ssl]://[HOST]:[PORT:80]"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "16-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "piwigo",
"source": "github",
"upstream_repo": "linuxserver/docker-piwigo",
"upstream_version": "14.0.0"
"upstream_version": "14.1.0"
}

View File

@@ -1,3 +1,6 @@
## 1.32.8.7639-fb6452ebf-ls198 (30-12-2023)
- Update to latest version from linuxserver/docker-plex
### 1.32.8.7639-fb6452ebf-ls197-3 (26-12-2023)
- Minor bugs fixed
### 1.32.8.7639-fb6452ebf-ls197-2 (26-12-2023)

View File

@@ -129,7 +129,7 @@
"slug": "plex_nas",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex",
"version": "1.32.8.7639-fb6452ebf-ls197-3",
"version": "1.32.8.7639-fb6452ebf-ls198",
"video": true,
"webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web"
}

View File

@@ -1,9 +1,9 @@
{
"github_fulltag": "true",
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "plex",
"source": "github",
"upstream_repo": "linuxserver/docker-plex",
"upstream_version": "1.32.8.7639-fb6452ebf-ls197"
"upstream_version": "1.32.8.7639-fb6452ebf-ls198"
}

View File

@@ -1,4 +1,7 @@
## nightly-1.11.4.4171-ls71 (30-12-2023)
- Update to latest version from linuxserver/docker-prowlarr
## nightly-1.11.3.4163-ls68 (23-12-2023)
- Update to latest version from linuxserver/docker-prowlarr

View File

@@ -98,6 +98,6 @@
"slug": "prowlarr",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "nightly-1.11.3.4163-ls68",
"version": "nightly-1.11.4.4171-ls71",
"webui": "[PROTO:ssl]://[HOST]:[PORT:9696]"
}

View File

@@ -1,10 +1,10 @@
{
"github_beta": "true",
"github_fulltag": "true",
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "prowlarr",
"source": "github",
"upstream_repo": "linuxserver/docker-prowlarr",
"upstream_version": "nightly-1.11.3.4163-ls68"
"upstream_version": "nightly-1.11.4.4171-ls71"
}

View File

@@ -1,7 +1,11 @@
### 4.6.2_29 (30-12-2023)
- Minor bugs fixed
- Feat : sanitize ovpn files (disabling ipv6 as not supported by HA, ensuring CRLF, ensure trailing new line, checking paths of referenced static files...)
- Feat : if no ovpn is referred in the option, it will use a random one from the openvpn folder (from https://github.com/Trigus42/alpine-qbittorrentvpn)
- Fix : avoid addon restart at each start (due to blanks being cleaned in the whitelist field)
- Fix : reduce cron log level to avoid spam
### 4.6.2_27_reverted (23-12-2023)
- Minor bugs fixed
### 4.6.2_26_reverted (23-12-2023)
- Minor bugs fixed
- &#9888; BREAKING CHANGE : I've decided to revert to the initial upstream image, apologies for this whole incovenience. After receiving many constructive (or plainly negative) feedbacks I have decided it was just not worth it to implement a new upstream image supposed to prevent ip leak for openvpn, plus wireguard support, and decided to just restore my own code. I've still kept qbit_manage, and will perhaps implement wireguard in the future but with my own code. As the databases were migrated for users to the new config locations, I've decided to keep it like that. It is more sustainable as HA is pushing in this direction and allows to backup the config with the addon (which was not the case previously).
- &#9888; ACTION (preferred) : Please restore a backup prior to the versions containing wireguard_openvpn in the name, then update (as was mentioned in the 4.6.2-5wireguard_openvpn changelog asking a full backup prior to update). This will make sure all your options are kept and you don't need to reconfigure

View File

@@ -1,6 +1,5 @@
## &#9888; Open Issue : [🐛 [qbittorrent] Problems with network drive (opened 2023-12-10)](https://github.com/alexbelgium/hassio-addons/issues/1125) by [@floralvikings](https://github.com/floralvikings)
## &#9888; Open Issue : [[qbittorrent] Mullvad vpn : udp4 permission denied (opened 2023-12-11)](https://github.com/alexbelgium/hassio-addons/issues/1127) by [@Stooovie](https://github.com/Stooovie)
## &#9888; Open Issue : [🐛 [qbittorrent] Unable to get qbitmanage to run (opened 2023-12-13)](https://github.com/alexbelgium/hassio-addons/issues/1131) by [@hacshacdgacs](https://github.com/hacshacdgacs)
## &#9888; Open Issue : [[Qbittorrent] random ovpn is NOT used as advertised in changelog (opened 2023-12-30)](https://github.com/alexbelgium/hassio-addons/issues/1150) by [@Stooovie](https://github.com/Stooovie)
# Home assistant add-on: qbittorrent
[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
@@ -65,7 +64,7 @@ cifsusername: "username" # optional, smb username, same for all smb shares
cifspassword: "password" # optional, smb password
cifsdomain: "domain" # optional, allow setting the domain for the smb share
openvpn_enabled: true/false # is openvpn required to start qbittorrent
openvpn_config": For example "config.ovpn" # name of the file located in /config/openvpn.
openvpn_config": For example "config.ovpn" # name of the file located in /config/openvpn. If empty, a random one will be used
openvpn_username": USERNAME
openvpn_password: YOURPASSWORD
openvpn_alt_mode: bind at container level and not app level

View File

@@ -139,5 +139,5 @@
"slug": "qbittorrent",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "4.6.2_27_reverted"
"version": "4.6.2_29"
}

View File

@@ -117,6 +117,9 @@ fi
cd "$CONFIG_LOCATION"/ || true
WHITELIST="$(bashio::config 'whitelist')"
# Sanitize blanks after comma
WHITELIST="${WHITELIST// /}"
WHITELIST="${WHITELIST//,/,\ }"
#clean data
sed -i '/AuthSubnetWhitelist/d' qBittorrent.conf

View File

@@ -14,22 +14,25 @@ if bashio::config.true 'openvpn_enabled'; then
bashio::log.info "Openvpn enabled, configuring"
bashio::log.info "----------------------------"
# If openvpn_config not set, but folder is not empty
if [ ! "$(ls -A /config/openvpn/*.ovpn 2>/dev/null)" ]; then
bashio::exit.nok "Configured ovpn file : $openvpn_config not found! Are you sure you added it in /addon_configs/$HOSTNAME/openvpn using the Filebrowser addon ?"
fi
# Get current ip
curl -s ipecho.net/plain > /currentip
# Function to check for files path
function check_path () {
# Get variable
file="$1"
# Get variable
file="$1"
# Double check exists
if [ ! -f "$file" ]; then
bashio::warning "$file not found"
return 1
fi
cp "$file" /tmpfile
# Loop through each line of the input file
while read line
while read -r line
do
# Check if the line contains a txt file
if [[ "$line" =~ \.txt ]] || [[ "$line" =~ \.crt ]]; then
@@ -49,14 +52,18 @@ if bashio::config.true 'openvpn_enabled'; then
fi
fi
fi
done < "$file"
done < /tmpfile
# Standardize lf
dos2unix "$file"
rm /tmpfile
# Standardize lf
dos2unix "$file"
# Correct paths
sed -i "s=/etc/openvpn=/config/openvpn=g" "$file"
# Ensure config ends with a line feed
sed -i "\$q" "$file"
# Correct paths
sed -i "s=/etc/openvpn=/config/openvpn=g" "$file"
}
@@ -82,10 +89,12 @@ if bashio::config.true 'openvpn_enabled'; then
else
bashio::exit.nok "Configured ovpn file : $openvpn_config is set but does not end by .ovpn ; it can't be used!"
fi
else
bashio::exit.nok "Configured ovpn file : $openvpn_config not found! Are you sure you added it in /addon_configs/$HOSTNAME/openvpn using the Filebrowser addon ?"
fi
# If openvpn_config not set, but folder is not empty
else
# If openvpn_config not set, but folder is not empty
elif [ ! "$(ls -A /config/openvpn/*.ovpn 2>/dev/null)" ]; then
# Look for openvpn files
# Wildcard search for openvpn config files and store results in array
mapfile -t VPN_CONFIGS < <( find /config/openvpn -maxdepth 1 -name "*.ovpn" -print )
@@ -100,6 +109,10 @@ if bashio::config.true 'openvpn_enabled'; then
cp /config/openvpn/* /etc/openvpn/
# Standardize file
cp /config/openvpn/"${openvpn_config}" /etc/openvpn/config.ovpn
# If openvpn_enabled set, config not set, and openvpn folder empty
else
bashio::exit.nok "openvpn_enabled is set, however, your openvpn folder is empty ! Are you sure you added it in /addon_configs/$HOSTNAME/openvpn using the Filebrowser addon ?"
fi
# Set credentials

View File

@@ -1,3 +1,6 @@
## 5.2.6.8376 (30-12-2023)
- Update to latest version from linuxserver/docker-radarr
### 5.1.3.8246-4 (02-12-2023)
- Minor bugs fixed
- Send crond messages to addon logs

View File

@@ -103,5 +103,5 @@
"slug": "radarr_nas",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr",
"version": "5.1.3.8246-4"
"version": "5.2.6.8376"
}

View File

@@ -1,8 +1,8 @@
{
"last_update": "18-11-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "radarr",
"source": "github",
"upstream_repo": "linuxserver/docker-radarr",
"upstream_version": "5.1.3.8246"
"upstream_version": "5.2.6.8376"
}

View File

@@ -1,4 +1,7 @@
## 0.3.14.2348 (30-12-2023)
- Update to latest version from linuxserver/docker-readarr
## 0.3.13.2334 (23-12-2023)
- Update to latest version from linuxserver/docker-readarr

View File

@@ -102,5 +102,5 @@
"slug": "readarr_nas",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr",
"version": "0.3.13.2334"
"version": "0.3.14.2348"
}

View File

@@ -1,9 +1,9 @@
{
"github_beta": "true",
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "readarr",
"source": "github",
"upstream_repo": "linuxserver/docker-readarr",
"upstream_version": "0.3.13.2334"
"upstream_version": "0.3.14.2348"
}

View File

@@ -1,4 +1,10 @@
## 4.0.0.741 (30-12-2023)
- Update to latest version from linuxserver/docker-sonarr
## 4.0.0.740 (30-12-2023)
- Update to latest version from linuxserver/docker-sonarr
## 4.0.0.738 (23-12-2023)
- Update to latest version from linuxserver/docker-sonarr

View File

@@ -16,7 +16,7 @@
ARG BUILD_FROM
ARG BUILD_VERSION
ARG BUILD_UPSTREAM="4.0.0.738"
ARG BUILD_UPSTREAM="4.0.0.741"
FROM ${BUILD_FROM}
##################

View File

@@ -103,5 +103,5 @@
"slug": "sonarr_nas",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons/tree/master/sonarr",
"version": "4.0.0.738"
"version": "4.0.0.741"
}

View File

@@ -1,9 +1,9 @@
{
"github_beta": true,
"last_update": "23-12-2023",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "sonarr",
"source": "github",
"upstream_repo": "linuxserver/docker-sonarr",
"upstream_version": "4.0.0.738"
"upstream_version": "4.0.0.741"
}

View File

@@ -1,5 +1,3 @@
## &#9888; Open Issue : [🐛 [Transmission] infinite download time (opened 2023-12-19)](https://github.com/alexbelgium/hassio-addons/issues/1140) by [@maxpoz1](https://github.com/maxpoz1)
## &#9888; Open Request : [✨ [REQUEST] Transmission Openvpn , add custom value for OPENVPN_PROVIDER (opened 2023-12-20)](https://github.com/alexbelgium/hassio-addons/issues/1141) by [@Moosketair](https://github.com/Moosketair)
# Home assistant add-on: Transmission

View File

@@ -1,3 +1,7 @@
### v5.3.1-6 (29-12-2023)
- Minor bugs fixed
- BREAKING CHANGE FOR CUSTOM VPN : if you are using a custom VPN provider, you must remove OPENVPN_CUSTOM_PROVIDER from your addon option and instead set OPENVPN_PROVIDER to "custom", then reference your ovpn file in your "OPENVPN_CONFIG". For example, if AIRVPN has provided to you an *.ovpn filed named AIRVPN.ovpn, you need to install an addon such as Filebrowser, go in the /config/addons_config/transmission/openvpn folder and put the AIRVPN.ovpn here. Then, in the addon option you need to write "AIRVPN" in the "OPENVPN_CONFIG" option
- Removed (not used anymore) : "OPENVPN_CUSTOM_PROVIDER", "OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION", "TRANSMISSION_V3_UPDATE"
## v5.3.1 (09-12-2023)
- Update to latest version from haugene/docker-transmission-openvpn

View File

@@ -1,4 +1,3 @@
## &#9888; Open Request : [✨ [REQUEST] Transmission Openvpn , add custom value for OPENVPN_PROVIDER (opened 2023-12-20)](https://github.com/alexbelgium/hassio-addons/issues/1141) by [@Moosketair](https://github.com/Moosketair)
# Home assistant add-on: Transmission Openvpn
[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
@@ -40,9 +39,7 @@ comparison to installing any other Hass.io add-on.
Options : see https://github.com/haugene/docker-transmission-openvpn for documentation
TRANSMISSION_V3_UPDATE: updates to v3. Remove and add all torrents due to transmission changes
For setting a custom openvpn file, you should flag the "OPENVPN_CUSTOM_PROVIDER" field and reference the path of the \*.ovpn file in the "OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION" field.
For setting a custom openvpn file (even if using AIRVPN), you should set OPENVPN_PROVIDER to "custom", then reference your ovpn file in your "OPENVPN_CONFIG". For example, if AIRVPN has provided to you an *.ovpn filed named AIRVPN.ovpn, you need to install an addon such as Filebrowser, go in the /config/addons_config/transmission/openvpn folder and put the AIRVPN.ovpn here. Then, in the addon option you need to write "AIRVPN" in the "OPENVPN_CONFIG" option
Complete transmission options are in /config/addons_config/transmission (make sure addon is stopped before modifying it as Transmission writes its ongoing values when stopping and could erase your changes)

View File

@@ -112,17 +112,14 @@
"DNS_server": "str?",
"LOCAL_NETWORK": "str",
"OPENVPN_CONFIG": "str?",
"OPENVPN_CUSTOM_PROVIDER": "bool?",
"OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION": "str?",
"OPENVPN_PASSWORD": "str",
"OPENVPN_PROVIDER": "list(|anonine|anonvpn|blackvpn|btguard|bulletvpn|cryptostorm|expressvpn|fastestvpn|freevpn|froot|frostvpn|getflix|ghostpath|giganews|goosevpn|hideme|hidemyass|integrityvpn|ipvanish|ironsocket|ivacy|ivpn|mullvad|nordvpn|octanevpn|ovpn|pia|privado|privatevpn|protonvpn|proxpn|purevpn|ra4w|safervpn|slickvpn|slickvpncore|smartdnsproxy|smartvpn|surfshark|tiger|torguard|trustzone|tunnelbear|vpnac|vpnarea|vpnbook|vpnfacile|vpnht|vpntunnel|vpnunlimited|vyprvpn|wevpn|windscribe|zoogvpn)?",
"OPENVPN_PROVIDER": "list(custom|anonine|anonvpn|blackvpn|btguard|bulletvpn|cryptostorm|expressvpn|fastestvpn|freevpn|froot|frostvpn|getflix|ghostpath|giganews|goosevpn|hideme|hidemyass|integrityvpn|ipvanish|ironsocket|ivacy|ivpn|mullvad|nordvpn|octanevpn|ovpn|pia|privado|privatevpn|protonvpn|proxpn|purevpn|ra4w|safervpn|slickvpn|slickvpncore|smartdnsproxy|smartvpn|surfshark|tiger|torguard|trustzone|tunnelbear|vpnac|vpnarea|vpnbook|vpnfacile|vpnht|vpntunnel|vpnunlimited|vyprvpn|wevpn|windscribe|zoogvpn)?",
"OPENVPN_USERNAME": "str",
"PGID": "int",
"PUID": "int",
"TRANSMISSION_DOWNLOAD_DIR": "str",
"TRANSMISSION_HOME": "str",
"TRANSMISSION_INCOMPLETE_DIR": "str",
"TRANSMISSION_V3_UPDATE": "bool?",
"TRANSMISSION_WATCH_DIR": "str",
"TRANSMISSION_WEB_UI": "list(standard|combustion|kettu|transmission-web-control|flood-for-transmission|shift)",
"WEBPROXY_ENABLED": "bool",
@@ -136,5 +133,5 @@
"slug": "transmission_openvpn",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "v5.3.1"
"version": "v5.3.1-6"
}

View File

@@ -1,29 +1,5 @@
#!/usr/bin/bashio
#################
# Update to v3 #
################
if bashio::config.true "TRANSMISSION_V3_UPDATE"; then
(
bashio::log.info "Updating transmission to v3"
bashio::log.warning "If your previous version was v2, remove and add torrents again"
# see https://github.com/haugene/docker-transmission-openvpn/discussions/1937
wget -O 976b5901365c5ca1.key "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xa37da909ae70535824d82620976b5901365c5ca1"
cat > /etc/apt/sources.list.d/transmission.list <<EOF
# Transmission PPA https://launchpad.net/~transmissionbt/+archive/ubuntu/ppa
deb [signed-by=/976b5901365c5ca1.key] http://ppa.launchpad.net/transmissionbt/ppa/ubuntu focal main
#deb-src http://ppa.launchpad.net/transmissionbt/ppa/ubuntu focal main
EOF
apt-get update -o Dir::Etc::sourcelist="sources.list.d/transmission.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
apt-get install -y transmission-daemon transmission-cli
) >/dev/null
fi
# shellcheck shell=bash
####################
# Export variables #
@@ -36,6 +12,8 @@ for k in $(bashio::jq "/data/options.json" 'keys | .[]'); do
done
echo ""
mkdir -p "$TRANSMISSION_HOME"/openvpn
###########################
# Correct download folder #
###########################
@@ -81,33 +59,95 @@ done
# Custom provider #
###################
if bashio::config.true "OPENVPN_CUSTOM_PROVIDER"; then
# Migrate OPENVPN_CUSTOM_PROVIDER to OPENVPN_PROVIDER
if bashio::config.true 'OPENVPN_CUSTOM_PROVIDER'; then
# Use new option
bashio::addon.option "OPENVPN_PROVIDER" "custom"
# Remove previous option
bashio::addon.option "OPENVPN_CUSTOM_PROVIDER"
# log
bashio::log.yellow "OPENVPN_CUSTOM_PROVIDER actived, OPENVPN_PROVIDER set to custom"
# Restart
bashio::addon.restart
fi
OVPNLOCATION="$(bashio::config "OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION")"
OVPNCONFIG="$(bashio::config "OPENVPN_CONFIG")"
OPENVPN_PROVIDER="${OVPNLOCATION##*/}"
OPENVPN_PROVIDER="${OPENVPN_PROVIDER%.*}"
OPENVPN_PROVIDER="${OPENVPN_PROVIDER,,}"
bashio::log.info "Custom openvpn provider selected"
# Function to check for files path
function check_path () {
# Check that ovpn file exists
if [ ! -f "$OVPNLOCATION" ]; then
bashio::log.fatal "Ovpn file not found at location provided : $OVPNLOCATION"
exit 1
# Get variable
file="$1"
# Double check exists
if [ ! -f "$file" ]; then
bashio::warning "$file not found"
return 1
fi
# Copy ovpn file
sed -i "s|config_repo_temp_dir=\$(mktemp -d)|config_repo_temp_dir=/tmp/tmp2|g" /etc/openvpn/fetch-external-configs.sh
echo "Copying ovpn file to proper location"
mkdir -p /etc/openvpn/"$OPENVPN_PROVIDER"
mkdir -p /tmp/tmp2/temp/openvpn/"$OPENVPN_PROVIDER"
cp "$OVPNLOCATION" /tmp/tmp2/temp/openvpn/"$OPENVPN_PROVIDER"/"$OPENVPN_PROVIDER".ovpn || \
cp "$OVPNLOCATION/$OVPNCONFIG" /tmp/tmp2/temp/openvpn/"$OPENVPN_PROVIDER"/"$OPENVPN_PROVIDER".ovpn
cp "$file" /tmpfile
# Use custom provider
echo "Exporting variable for custom provider : $OPENVPN_PROVIDER"
export OPENVPN_PROVIDER="$OPENVPN_PROVIDER"
export OPENVPN_CONFIG="$OPENVPN_PROVIDER"
# Loop through each line of the input file
while read -r line
do
# Check if the line contains a txt file
if [[ "$line" =~ \.txt ]] || [[ "$line" =~ \.crt ]]; then
# Extract the txt file name from the line
file_name="$(echo "$line" | awk -F' ' '{print $2}')"
# Check if the txt file exists
if [ ! -f "$file_name" ]; then
# Check if the txt file exists in the /config/openvpn/ directory
if [ -f "/etc/openvpn/custom/${file_name##*/}" ]; then
# Append /config/openvpn/ in front of the original txt file in the ovpn file
sed -i "s|$file_name|/etc/openvpn/custom/${file_name##*/}|g" "$file"
# Print a success message
bashio::log.warning "Appended /etc/openvpn/custom/ to ${file_name##*/} in $file"
else
# Print an error message
bashio::log.warning "$file_name is referenced in your ovpn file but does not exist in the $TRANSMISSION_HOME/openvpn folder"
sleep 5
fi
fi
fi
done < /tmpfile
rm /tmpfile
# Ensure config ends with a line feed
sed -i "\$q" "$file"
}
# Define custom file
if [ "$(bashio::config "OPENVPN_PROVIDER")" == "custom" ]; then
# Validate ovpn file
openvpn_config="$(bashio::config "OPENVPN_CONFIG")"
# If contains *.ovpn, clean option
if [[ "$openvpn_config" == *".ovpn" ]]; then
bashio::log.warning "OPENVPN_CONFIG should not end by ovpn, correcting"
bashio::addon.option 'OPENVPN_CONFIG' "${openvpn_config%.ovpn}"
bashio::addon.restart
fi
# Add ovpn
openvpn_config="${openvpn_config}.ovpn"
# log
bashio::log.info "OPENVPN_PROVDER set to custom, will use the openvpn file OPENVPN_CONFIG : $openvpn_config"
# If file found
if [ -f "$TRANSMISSION_HOME"/openvpn/"$openvpn_config" ]; then
echo "... configured ovpn file : using $TRANSMISSION_HOME/openvpn/$openvpn_config"
# Copy files
rm -r /etc/openvpn/custom
# Symlink folder
echo "... symlink the $TRANSMISSION_HOME/openvpn foplder to /etc/openvpn/custom"
ln -s "$TRANSMISSION_HOME"/openvpn /etc/openvpn/custom
# Check path
check_path /etc/openvpn/custom/"$openvpn_config"
else
bashio::exit.nok "Configured ovpn file : $openvpn_config not found! Are you sure you added it in $TRANSMISSION_HOME/openvpn ?"
fi
else

View File

@@ -1,4 +1,9 @@
## 0.12.0 (30-12-2023)
- Update to latest version from Unpackerr/unpackerr
- &#9888; MAJOR CHANGE : switch to the new config logic from homeassistant. Your configuration files will have migrated from /config to a folder only accessible from my Filebrowser addon called /addon_configs/db21ed7f_unpackerr. This avoids the addon to mess with your homeassistant configuration folder, and allows to backup the options. Migration of data, custom configs, and custom scripts should be automatic. Please be sure to update all your links however ! For more information, see here : https://developers.home-assistant.io/blog/2023/11/06/public-addon-config/
## testing-e916f00-9-linux-arm64-2023-09-17 (2023-09-17)
- Update to latest version from hotio/unpackerr

View File

@@ -28,9 +28,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_SERVICES_GRACETIME=0
# Global LSIO modifications
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
ARG CONFIGLOCATION="/config"
RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
#ARG CONFIGLOCATION="/config"
#RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
##################
# 3 Install apps #

View File

@@ -60,9 +60,10 @@
"image": "ghcr.io/alexbelgium/unpackerr-{arch}",
"init": false,
"map": [
"config:rw",
"share:rw",
"media:rw",
"addon_config:rw",
"homeassistant_config:rw",
"share:rw",
"ssl"
],
"name": "Unpackerr",
@@ -85,10 +86,11 @@
"extraction_path": "str?",
"localdisks": "str?",
"networkdisks": "str?",
"watch_path": "str?"
"watch_path": "str?",
"TZ": "str?"
},
"slug": "unpackerr",
"udev": true,
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "testing-e916f00-9-linux-arm64-2023-09-17"
"version": "0.12.0"
}

View File

@@ -0,0 +1,6 @@
#!/usr/bin/bashio
if [ -f /homeassistant/unpackerr.conf ]; then
bashio::log.warning "Migrating unpackerr.conf to /addons_configs/$HOSTNAME/unpackerr.conf"
mv /homeassistant/unpackerr.conf /config/unpackerr.conf
fi

View File

@@ -1,11 +1,14 @@
#!/usr/bin/bashio
# Set user
if bashio::config.has_value 'PUID'; then PUID="$(bashio::config 'PUID')"; fi
if bashio::config.has_value 'PGID'; then PGID="$(bashio::config 'PGID')"; fi
if bashio::config.has_value 'PUID'; then export PUID="$(bashio::config 'PUID')"; fi
if bashio::config.has_value 'PGID'; then export PGID="$(bashio::config 'PGID')"; fi
if bashio::config.has_value 'TZ'; then export TZ="$(bashio::config 'TZ')"; fi
# Enable watch folder
if bashio::config.has_value "watch_path"; then
# Info
bashio::log.info "Watch path is $(bashio::config 'watch_path'), creating folder and setting permission"
# Enables folders
sed -i "/[[folder]]/c [[folder]]" /config/unpackerr.conf
# Set downloads path
@@ -20,6 +23,8 @@ fi
# Enable extraction folder
if bashio::config.has_value "extraction_path"; then
# Info
bashio::log.info "Extraction path is $(bashio::config 'extraction_path'), creating folder and setting permission"
# Enables folders
sed -i "/[[folder]]/c [[folder]]" /config/unpackerr.conf
# Set extraction path

View File

@@ -1,10 +1,10 @@
{
"dockerhub_by_date": true,
"fulltag": true,
"last_update": "2023-09-17",
"last_update": "30-12-2023",
"repository": "alexbelgium/hassio-addons",
"slug": "unpackerr",
"source": "dockerhub",
"upstream_repo": "hotio/unpackerr",
"upstream_version": "testing-e916f00-9-linux-arm64-2023-09-17"
"source": "github",
"upstream_repo": "Unpackerr/unpackerr",
"upstream_version": "0.12.0"
}