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

revert

Browse Source
This commit is contained in:
Alexandre
2021-12-29 13:38:09 +01:00
parent 03fc02af43
commit 52846f769f
5 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qbittorrent/CHANGELOG.md
View File

@@ -1,4 +1,3 @@
- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
- Removed watchdog - Removed watchdog
- New standardized logic for Dockerfile build and packages installation - New standardized logic for Dockerfile build and packages installation
- Allow mounting nvme - Allow mounting nvme

4
qbittorrent/Dockerfile
View File

@@ -37,8 +37,8 @@ RUN \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
\ \
# Correct permissions # Correct permissions
&& sed -i 's=/config=/config/addons_config/qBittorrent || true=g' /etc/cont-init.d/10-adduser \ && sed -i 's=/config=/config/qBittorrent || true=g' /etc/cont-init.d/10-adduser \
&& sed -i 's= /config=/config/addons_config/qBittorrent || true=g' /etc/cont-init.d/30-config \ && sed -i 's= /config=/config/qBittorrent || true=g' /etc/cont-init.d/30-config \
\ \
# Set download folder to /share # Set download folder to /share
&& sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \ && sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \

16
qbittorrent/rootfs/etc/cont-init.d/20-folders.sh
View File

@@ -1,16 +0,0 @@
#!/usr/bin/with-contenv bash
slug=qBittorrent
if [ -d /config/$slug ]; then
echo "Moving to new location /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
mv /config/$slug/* /config/addons_config/$slug/
fi
if [ ! -d /config/addons_config/$slug ]; then
echo "Creating /config/addons_config/$slug"
mkdir -p /config/addons_config/$slug
chmod 777 /config/addons_config/$slug
fi

12
qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh
View File

@@ -5,7 +5,7 @@
########## ##########
# Define preferences line # Define preferences line
cd /config/addons_config/qBittorrent/ cd /config/qBittorrent/
LINE=$(sed -n '/Preferences/=' qBittorrent.conf) LINE=$(sed -n '/Preferences/=' qBittorrent.conf)
LINE=$((LINE + 1)) LINE=$((LINE + 1))
@@ -70,7 +70,7 @@ fi
# WHITELIST # # WHITELIST #
################ ################
cd /config/addons_config/qBittorrent/ cd /config/qBittorrent/
if bashio::config.has_value 'whitelist'; then if bashio::config.has_value 'whitelist'; then
WHITELIST=$(bashio::config 'whitelist') WHITELIST=$(bashio::config 'whitelist')
#clean data #clean data
@@ -84,7 +84,7 @@ fi
# USERNAME # # USERNAME #
############### ###############
cd /config/addons_config/qBittorrent/ cd /config/qBittorrent/
if bashio::config.has_value 'Username'; then if bashio::config.has_value 'Username'; then
USERNAME=$(bashio::config 'Username') USERNAME=$(bashio::config 'Username')
#clean data #clean data
@@ -131,8 +131,8 @@ if bashio::config.has_value 'customUI'; then
rm /webui/*.zip rm /webui/*.zip
CUSTOMUIDIR="$(dirname "$(find /webui/$CUSTOMUI -iname "public" -type d)")" CUSTOMUIDIR="$(dirname "$(find /webui/$CUSTOMUI -iname "public" -type d)")"
# Set qbittorrent # Set qbittorrent
sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/addons_config/qBittorrent/qBittorrent.conf sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/qBittorrent/qBittorrent.conf
sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/addons_config/qBittorrent/qBittorrent.conf sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/qBittorrent/qBittorrent.conf
# Set nginx # Set nginx
#sed -i "s=/vuetorrent/public/=$CUSTOMUIDIR/public/=g" /etc/nginx/servers/ingress.conf #sed -i "s=/vuetorrent/public/=$CUSTOMUIDIR/public/=g" /etc/nginx/servers/ingress.conf
#sed -i "s=vue.torrent=$CUSTOMUI.torrent=g" /etc/nginx/servers/ingress.conf #sed -i "s=vue.torrent=$CUSTOMUI.torrent=g" /etc/nginx/servers/ingress.conf
@@ -144,4 +144,4 @@ fi
########## ##########
bashio::log.info "Default username/password : admin/adminadmin" bashio::log.info "Default username/password : admin/adminadmin"
bashio::log.info "Configuration can be found in /config/addons_config/qBittorrent" bashio::log.info "Configuration can be found in /config/qBittorrent"

6
qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh
View File

@@ -37,9 +37,9 @@ if bashio::config.true 'openvpn_enabled'; then
# CONFIGURE QBITTORRENT # # CONFIGURE QBITTORRENT #
######################### #########################
QBT_CONFIG_FILE="/config/addons_config/qBittorrent/qBittorrent.conf" QBT_CONFIG_FILE="/config/qBittorrent/qBittorrent.conf"
# Define preferences line # Define preferences line
cd /config/addons_config/qBittorrent/ cd /config/qBittorrent/
LINE=$(sed -n '/Preferences/=' qBittorrent.conf) LINE=$(sed -n '/Preferences/=' qBittorrent.conf)
LINE=$((LINE + 1)) LINE=$((LINE + 1))
@@ -76,7 +76,7 @@ else
# REMOVE OPENVPN # # REMOVE OPENVPN #
################## ##################
# Ensure no redirection by removing the direction tag # Ensure no redirection by removing the direction tag
cd /config/addons_config/qBittorrent/ cd /config/qBittorrent/
sed -i '/Interface/d' qBittorrent.conf sed -i '/Interface/d' qBittorrent.conf
bashio::log.info "Direct connection without VPN enabled" bashio::log.info "Direct connection without VPN enabled"