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

Config location changed

Browse Source
This commit is contained in:
Alexandre
2022-09-11 07:30:35 +02:00
parent 0013016737
commit b0c501eaab
5 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qbittorrent/CHANGELOG.md
View File

@@ -1,12 +1,17 @@
- Config folder moved to /config/addons_config/qBittorrent
## 4.4.5-r0-ls214 (09-09-2022) ## 4.4.5-r0-ls214 (09-09-2022)
- Update to latest version from linuxserver/docker-qbittorrent - Update to latest version from linuxserver/docker-qbittorrent
## 4.4.5-r0-ls213 (01-09-2022) ## 4.4.5-r0-ls213 (01-09-2022)
- Update to latest version from linuxserver/docker-qbittorrent - Update to latest version from linuxserver/docker-qbittorrent
## 4.4.3.1-r1-ls211 (30-08-2022) ## 4.4.3.1-r1-ls211 (30-08-2022)
- Update to latest version from linuxserver/docker-qbittorrent - Update to latest version from linuxserver/docker-qbittorrent
## 4.4.3.1-r1-ls210 (13-08-2022) ## 4.4.3.1-r1-ls210 (13-08-2022)
- Update to latest version from linuxserver/docker-qbittorrent - Update to latest version from linuxserver/docker-qbittorrent

12
qbittorrent/Dockerfile
View File

@@ -35,7 +35,10 @@ ENV \
PS1="$(whoami)@$(hostname):$(pwd)$ " \ PS1="$(whoami)@$(hostname):$(pwd)$ " \
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \ S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES=1 \
TERM="xterm-256color" TERM="xterm-256color" \
HOME="/config/addons_config" \
XDG_CONFIG_HOME="/config/addons_config" \
XDG_DATA_HOME="/config/addons_config"
# Image specific modifications # Image specific modifications
RUN \ RUN \
@@ -45,13 +48,10 @@ RUN \
# Remove fixed folders, allows connection to webUI # Remove fixed folders, allows connection to webUI
&& sed '11,13d' /defaults/qBittorrent.conf \ && sed '11,13d' /defaults/qBittorrent.conf \
&& echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \ && echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
&& echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf \ && echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf
\
# Change location of config
&& sed -i "s|/config$|/config/qBittorrent|g" "/etc/s6-overlay/s6-rc.d/init-qbittorrent/run"
# Global LSIO modifications # Global LSIO modifications
ARG CONFIGLOCATION="/config" ARG CONFIGLOCATION="/config/addons_config/qBittorrent"
# hadolint ignore=SC2015, SC2013 # hadolint ignore=SC2015, SC2013
RUN \ RUN \
# Avoid custom-init.d duplications # Avoid custom-init.d duplications

8
qbittorrent/rootfs/etc/cont-init.d/00-folders.sh
View File

@@ -1,4 +1,10 @@
#!/bin/bash #!/bin/bash
mkdir -p /config/qBittorrent mkdir -p /config/addons_config/qBittorrent
if [ -f /config/qBittorrent/qBittorrent.conf ]; then
echo "Migrating previous folder"
cp -prf /config/qBittorrent/* /config/addons_config/qBittorrent/
rm -r /config/qBittorrent/*
echo "Files were moved to /config/addons_config/qBittorrent" > /config/qBittorrent/filesmoved
fi

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

@@ -6,14 +6,14 @@
########## ##########
# Define preferences line # Define preferences line
mkdir -p /config/qBittorrent mkdir -p /config/addons_config/qBittorrent
# copy default config # copy default config
if [ ! -f /config/qBittorrent/qBittorrent.conf ]; then if [ ! -f /config/addons_config/qBittorrent/qBittorrent.conf ]; then
cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf cp /defaults/qBittorrent.conf /config/addons_config/qBittorrent/qBittorrent.conf
fi fi
cd /config/qBittorrent/ || true cd /config/addons_config/qBittorrent/ || true
LINE=$(sed -n '/Preferences/=' qBittorrent.conf) LINE=$(sed -n '/Preferences/=' qBittorrent.conf)
LINE=$((LINE + 1)) LINE=$((LINE + 1))
@@ -39,11 +39,12 @@ if bashio::config.has_value 'SavePath'; then
# Replace save path # Replace save path
CURRENTSAVEPATH=$(sed -n '/Downloads\\SavePath/p' qBittorrent.conf) CURRENTSAVEPATH=$(sed -n '/Downloads\\SavePath/p' qBittorrent.conf)
sed -i "s|${CURRENTSAVEPATH#*=}|$DOWNLOADS|g" qBittorrent.conf 2>/dev/null || true sed -i "s|${CURRENTSAVEPATH#*=}|$DOWNLOADS|g" qBittorrent.conf || \
sed -i "${LINE}a Downloads\\SavePath\\$DOWNLOADS" qBittorrent.conf
# Replace session save path # Replace session save path
CURRENTSAVEPATH=$(sed -n '/Session\\DefaultSavePath/p' qBittorrent.conf) CURRENTSAVEPATH=$(sed -n '/Session\\DefaultSavePath/p' qBittorrent.conf)
sed -i "s|${CURRENTSAVEPATH#*=}|$DOWNLOADS|g" qBittorrent.conf 2>/dev/null || true sed -i "s|${CURRENTSAVEPATH#*=}|$DOWNLOADS|g" qBittorrent.conf || true
# Info # Info
bashio::log.info "Downloads can be found in $DOWNLOADS" bashio::log.info "Downloads can be found in $DOWNLOADS"
@@ -100,7 +101,7 @@ fi
# WHITELIST # # WHITELIST #
################ ################
cd /config/qBittorrent/ || true cd /config/addons_config/qBittorrent/ || true
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
@@ -114,7 +115,7 @@ fi
# USERNAME # # USERNAME #
############### ###############
cd /config/qBittorrent/ || true cd /config/addons_config/qBittorrent/ || true
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
@@ -162,8 +163,8 @@ if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ]; 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/qBittorrent/qBittorrent.conf sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/addons_config/qBittorrent/qBittorrent.conf
sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/qBittorrent/qBittorrent.conf sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/addons_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
@@ -175,4 +176,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/qBittorrent" bashio::log.info "Configuration can be found in /config/addons_config/qBittorrent"

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

@@ -6,7 +6,7 @@ declare openvpn_config
declare openvpn_username declare openvpn_username
declare openvpn_password declare openvpn_password
QBT_CONFIG_FILE="/config/qBittorrent/qBittorrent.conf" QBT_CONFIG_FILE="/config/addons_config/qBittorrent/qBittorrent.conf"
if bashio::config.true 'openvpn_enabled'; then if bashio::config.true 'openvpn_enabled'; then
@@ -69,7 +69,7 @@ if bashio::config.true 'openvpn_enabled'; then
echo "Using interface binding in the qBittorrent app" echo "Using interface binding in the qBittorrent app"
# Define preferences line # Define preferences line
cd /config/qBittorrent/ || exit 1 cd /config/addons_config/qBittorrent/ || exit 1
LINE=$(sed -n '/Preferences/=' "$QBT_CONFIG_FILE") LINE=$(sed -n '/Preferences/=' "$QBT_CONFIG_FILE")
LINE=$((LINE + 1)) LINE=$((LINE + 1))
SESSION=$(sed -n '/BitTorrent/=' "$QBT_CONFIG_FILE") SESSION=$(sed -n '/BitTorrent/=' "$QBT_CONFIG_FILE")