From b1842412dd8a6161c1bbbe0ed1a5e506a23d2681 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Wed, 29 Dec 2021 12:57:15 +0100 Subject: [PATCH] move config to addons_config --- bazarr/CHANGELOG.md | 3 +- filebrowser/CHANGELOG.md | 3 + filebrowser/Dockerfile | 3 - filebrowser/rootfs/scripts/20-folders.sh | 14 +++++ filebrowser/rootfs/scripts/99-run.sh | 6 +- flexget/Dockerfile | 6 +- flexget/rootfs/etc/cont-init.d/00-folders.sh | 17 +++++- jackett/CHANGELOG.md | 41 ++++++++++++- jellyfin/CHANGELOG.md | 2 +- jellyfin/rootfs/etc/cont-init.d/20-folders.sh | 7 --- joal/CHANGELOG.md | 6 +- joal/rootfs/scripts/99-run.sh | 8 +-- lidarr/CHANGELOG.md | 2 +- lidarr/Dockerfile | 4 +- lidarr/rootfs/etc/cont-init.d/20-folders.sh | 13 +++++ nzbget/CHANGELOG.md | 2 + nzbget/Dockerfile | 8 +-- nzbget/rootfs/etc/cont-init.d/20-folders.sh | 16 +++++ ombi/CHANGELOG.md | 4 ++ ombi/Dockerfile | 6 +- ombi/rootfs/etc/cont-init.d/20-folders.sh | 16 +++++ paperless_ng/CHANGELOG.md | 1 + paperless_ng/Dockerfile | 2 +- .../rootfs/etc/cont-init.d/20-folders.sh | 16 +++++ prowlarr/CHANGELOG.md | 39 ++++++++++++- qbittorrent/CHANGELOG.md | 1 + qbittorrent/Dockerfile | 4 +- .../rootfs/etc/cont-init.d/20-folders.sh | 16 +++++ .../91-qbittorrent_configuration.sh | 22 +++---- .../rootfs/etc/cont-init.d/93-openvpn.sh | 58 +++++++++---------- radarr/CHANGELOG.md | 2 +- readarr/CHANGELOG.md | 26 ++++++++- resiliosync/CHANGELOG.md | 1 + sonarr/CHANGELOG.md | 2 +- ubooquity/rootfs/etc/32-nginx_ingress.sh | 2 +- .../rootfs/etc/cont-init.d/20-folders.sh | 16 +++++ .../etc/cont-init.d/91-configuration.sh | 10 ++-- .../rootfs/etc/cont-init.d/93-custom_webUI.sh | 8 +-- 38 files changed, 320 insertions(+), 93 deletions(-) create mode 100644 filebrowser/rootfs/scripts/20-folders.sh create mode 100644 nzbget/rootfs/etc/cont-init.d/20-folders.sh create mode 100644 ombi/rootfs/etc/cont-init.d/20-folders.sh create mode 100644 paperless_ng/rootfs/etc/cont-init.d/20-folders.sh create mode 100644 qbittorrent/rootfs/etc/cont-init.d/20-folders.sh create mode 100644 ubooquity/rootfs/etc/cont-init.d/20-folders.sh diff --git a/bazarr/CHANGELOG.md b/bazarr/CHANGELOG.md index 15ffafed2..92a2d1435 100644 --- a/bazarr/CHANGELOG.md +++ b/bazarr/CHANGELOG.md @@ -1,7 +1,8 @@ -- Cleanup: config base folder changed to /config/addons_config +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - New standardized logic for Dockerfile build and packages installation ## 1.0.1 (20-11-2021) + - Update to latest version from linuxserver/docker-bazarr - Allow mounting local drives by label. Just pust the label instead of sda1 for example - Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename diff --git a/filebrowser/CHANGELOG.md b/filebrowser/CHANGELOG.md index be253e748..25908b78d 100644 --- a/filebrowser/CHANGELOG.md +++ b/filebrowser/CHANGELOG.md @@ -1,11 +1,14 @@ +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) ## 2.20.1 (23-12-2021) + - Update to latest version from hurlenko/filebrowser-docker - Mount ssl in write - New standardized logic for Dockerfile build and packages installation - Mount nvme drives ## 2.19.0 (25-11-2021) + - Update to latest version from hurlenko/filebrowser-docker - Allow mounting local drives by label. Just pust the label instead of sda1 for example diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index c00f2173b..12bb94528 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -21,9 +21,6 @@ FROM hurlenko/filebrowser:v${BUILD_UPSTREAM} # 2 Modify Image # ################## -RUN \ - # Correct upstream image folders links - mkdir -p -m 777 /config/filebrowser ################## # 3 Install apps # diff --git a/filebrowser/rootfs/scripts/20-folders.sh b/filebrowser/rootfs/scripts/20-folders.sh new file mode 100644 index 000000000..03b771545 --- /dev/null +++ b/filebrowser/rootfs/scripts/20-folders.sh @@ -0,0 +1,14 @@ +#!/usr/bin/with-contenv bash + +if [ -d /config/filebrowser ]; then + echo "Moving to new location /config/addons_config/filebrowser" + mkdir -p /config/addons_config/filebrowser + chmod 777 /config/addons_config/filebrowser + mv /config/filebrowser/* /config/addons_config/filebrowser/ +fi + +if [ ! -d /config/addons_config/filebrowser ]; then + echo "Creating /config/addons_config/filebrowser" + mkdir -p /config/addons_config/filebrowser + chmod 777 /config/addons_config/filebrowser +fi diff --git a/filebrowser/rootfs/scripts/99-run.sh b/filebrowser/rootfs/scripts/99-run.sh index f7b71bcc2..9ac86ca5f 100644 --- a/filebrowser/rootfs/scripts/99-run.sh +++ b/filebrowser/rootfs/scripts/99-run.sh @@ -59,7 +59,7 @@ NOAUTH="" if bashio::config.true 'NoAuth'; then if ! bashio::fs.file_exists "/data/noauth"; then rm /data/auth &>/dev/null || true - rm /config/filebrowser/filebrowser.dB &>/dev/null || true + rm /config/addons_config/filebrowser/filebrowser.dB &>/dev/null || true touch /data/noauth NOAUTH="--noauth" bashio::log.warning "Auth method change, database reset" @@ -68,7 +68,7 @@ if bashio::config.true 'NoAuth'; then else if ! bashio::fs.file_exists "/data/auth"; then rm /data/noauth &>/dev/null || true - rm /config/filebrowser/filebrowser.dB &>/dev/null || true + rm /config/addons_config/filebrowser/filebrowser.dB &>/dev/null || true touch /data/auth bashio::log.warning "Auth method change, database reset" fi @@ -83,7 +83,7 @@ fi bashio::log.info "Starting..." -/./filebrowser $CERTFILE $KEYFILE --root=$BASE_FOLDER --address=0.0.0.0 --database=/config/filebrowser/filebrowser.dB $NOAUTH & +/./filebrowser $CERTFILE $KEYFILE --root=$BASE_FOLDER --address=0.0.0.0 --database=/config/addons_config/filebrowser/filebrowser.dB $NOAUTH & bashio::net.wait_for 8080 localhost 900 || true bashio::log.info "Started !" exec nginx diff --git a/flexget/Dockerfile b/flexget/Dockerfile index cc5c00fa2..698764096 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -28,9 +28,9 @@ RUN \ && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ \ # Correct config folder - && grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/flexget|g' \ - && grep -rl " /config" /etc/services.d | xargs sed -i 's| /config| /config/flexget|g' \ - && sed -i 's=/config/flexget=/config/flexget || true=g' /etc/cont-init.d/10-adduser \ + && grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/flexget|g' \ + && grep -rl " /config" /etc/services.d | xargs sed -i 's| /config| /config/addons_config/flexget|g' \ + && sed -i 's=/config/flexget=/config/addons_config/flexget || true=g' /etc/cont-init.d/10-adduser \ \ # Set password && sed -i 's/bash/bashio/g' /etc/cont-init.d/20-config \ diff --git a/flexget/rootfs/etc/cont-init.d/00-folders.sh b/flexget/rootfs/etc/cont-init.d/00-folders.sh index 6e8bb9452..a6459b0d2 100644 --- a/flexget/rootfs/etc/cont-init.d/00-folders.sh +++ b/flexget/rootfs/etc/cont-init.d/00-folders.sh @@ -1,3 +1,16 @@ -#!/usr/bin/with-contenv bashio +#!/usr/bin/with-contenv bash -mkdir -p /config/flexget +slug=flexget + +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 diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index adbf42e61..23178c0ab 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,122 +1,161 @@ -- Cleanup: config base folder changed to /config/addons_config +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) ## 0.20.200 (28-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.197 (24-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.193 (23-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.184 (20-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.173 (18-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.172 (15-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.162 (14-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.159 (12-12-2021) + - Update to latest version from linuxserver/docker-jackett - New standardized logic for Dockerfile build and packages installation - Removed full access (not used anymore) ## 0.20.147 (11-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.141 (10-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.136 (09-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.123 (09-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.105 (07-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.95 (07-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.83 (03-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.79 (02-12-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.78 (30-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.74 (30-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.68 (27-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.65 (26-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.64 (25-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.63 (24-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.53 (22-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.44 (21-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.43 (20-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.41 (20-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.36 (18-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.20.10 (17-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.275 (16-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.266 (15-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.260 (14-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.229 (13-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.225 (11-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.215 (09-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.210 (08-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.207 (07-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.162 (05-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.147 (05-11-2021) + - Update to latest version from linuxserver/docker-jackett ## 0.19.138 (03-11-2021) + - Update to latest version from linuxserver/docker-jackett - Allow mounting local drives by label. Just pust the label instead of sda1 for example diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md index f5f99a4a0..445fc2c7a 100644 --- a/jellyfin/CHANGELOG.md +++ b/jellyfin/CHANGELOG.md @@ -1,4 +1,4 @@ -- Cleanup: config base folder changed to /config/addons_config +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - New standardized logic for Dockerfile build and packages installation - Add local mount (see readme) - Added watchdog feature diff --git a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh index ba976d9aa..fb332985e 100644 --- a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh +++ b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh @@ -24,12 +24,6 @@ if [ ! -d /share/jellyfin ]; then chown -R abc:abc /share/jellyfin fi -if [ ! -d /config/jellyfin ]; then - echo "Creating /config/jellyfin" - mkdir -p /config/jellyfin - chown -R abc:abc /config/jellyfin -fi - # links if [ ! -d /jellyfin/cache ]; then @@ -52,7 +46,6 @@ if [ ! -d /config/addons_config/jellyfin ]; then chown -R abc:abc /config/addons_config/jellyfin fi - if [ ! -d /jellyfin/data ]; then echo "Creating link for /jellyfin/data" mkdir -p /share/jellyfin/data diff --git a/joal/CHANGELOG.md b/joal/CHANGELOG.md index 67ba43b1d..5c00a7289 100644 --- a/joal/CHANGELOG.md +++ b/joal/CHANGELOG.md @@ -1,19 +1,23 @@ - ## 2.1.29 (23-12-2021) + - Update to latest version from anthonyraymond/joal ## 2.1.28 (14-12-2021) + - Update to latest version from anthonyraymond/joal - New standardized logic for Dockerfile build and packages installation ## 2.1.27 (17-11-2021) + - Update to latest version from anthonyraymond/joal ## 2.1.26 (18-07-2021) + - Update to latest version from anthonyraymond/joal - config exposed in /config/joal ## 2.1.24 + - Update to latest version from anthonyraymond/joal - Add ingress - Add option for auto stop after x time diff --git a/joal/rootfs/scripts/99-run.sh b/joal/rootfs/scripts/99-run.sh index f0a83cde8..2e7643331 100644 --- a/joal/rootfs/scripts/99-run.sh +++ b/joal/rootfs/scripts/99-run.sh @@ -32,14 +32,14 @@ bashio::log.info "Joal updated" ################## # If config doesn't exist, create it -if [ ! -f /config/joal/config.json ]; then +if [ ! -f /config/addon_config/joal/config.json ]; then bashio::log.info "Symlinking config files" - mkdir -p /config/joal - cp /data/joal/config.json /config/joal/config.json + mkdir -p /config/addon_config/joal + cp /data/joal/config.json /config/addon_config/joal/config.json fi # Refresh symlink -ln -sf /config/joal/config.json /data/joal/config.json +ln -sf /config/addon_config/joal/config.json /data/joal/config.json ############### # SET VARIABLES # diff --git a/lidarr/CHANGELOG.md b/lidarr/CHANGELOG.md index aab139117..0c6305534 100644 --- a/lidarr/CHANGELOG.md +++ b/lidarr/CHANGELOG.md @@ -1,5 +1,5 @@ +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - New standardized logic for Dockerfile build and packages installation - Allow mounting local drives by label. Just pust the label instead of sda1 for example - - Initial release - Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 3fd51f81f..09b5a564a 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -23,8 +23,8 @@ FROM ${BUILD_FROM} RUN \ # use /data instead of /config for hass.io environment - sed -i "s|/config|/config/lidarr|g" /etc/services.d/lidarr/run \ - && sed -i "s|/config|/config/lidarr|g" /etc/cont-init.d/30-config \ + sed -i "s|/config|/config/addons_config/lidarr|g" /etc/services.d/lidarr/run \ + && sed -i "s|/config|/config/addons_config/lidarr|g" /etc/cont-init.d/30-config \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders.sh b/lidarr/rootfs/etc/cont-init.d/20-folders.sh index c79dc4c13..d0d6b4e35 100644 --- a/lidarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/lidarr/rootfs/etc/cont-init.d/20-folders.sh @@ -11,3 +11,16 @@ if [ ! -d /share/downloads ]; then mkdir -p /share/downloads chown -R abc:abc /share/downloads fi + +if [ -d /config/lidarr ]; then + echo "Moving to new location /config/addons_config/lidarr" + mkdir -p /config/addons_config/lidarr + chmod 777 /config/addons_config/lidarr + mv /config/lidarr/* /config/addons_config/lidarr/ +fi + +if [ ! -d /config/addons_config/lidarr ]; then + echo "Creating /config/addons_config/lidarr" + mkdir -p /config/addons_config/lidarr + chmod 777 /config/addons_config/lidarr +fi diff --git a/nzbget/CHANGELOG.md b/nzbget/CHANGELOG.md index 975ed9b02..28e9e3ca0 100644 --- a/nzbget/CHANGELOG.md +++ b/nzbget/CHANGELOG.md @@ -1,4 +1,6 @@ +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) ## 21.1 (15-12-2021) + - Update to latest version from linuxserver/docker-nzbget - Initial release (latest builds) diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index b713afd4d..9772dc7e1 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -21,15 +21,15 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## -RUN sed -i "s|/config|/config/nzbget|g" /etc/services.d/nzbget/run \ - && sed -i "s|/config|/config/nzbget|g" /etc/cont-init.d/30-config \ - && sed -i "s|/config|/config/nzbget|g" /etc/cont-init.d/10-adduser \ +RUN sed -i "s|/config|/config/addons_config/nzbget|g" /etc/services.d/nzbget/run \ + && sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/30-config \ + && sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/10-adduser \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ # Create folder - && sed -i '1a mkdir -p /config/nzbget' /etc/cont-init.d/10-adduser + && sed -i '1a mkdir -p /config/addons_config/nzbget' /etc/cont-init.d/10-adduser ################## # 3 Install apps # diff --git a/nzbget/rootfs/etc/cont-init.d/20-folders.sh b/nzbget/rootfs/etc/cont-init.d/20-folders.sh new file mode 100644 index 000000000..e2b6790ec --- /dev/null +++ b/nzbget/rootfs/etc/cont-init.d/20-folders.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bash + +slug=nzbget + +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 diff --git a/ombi/CHANGELOG.md b/ombi/CHANGELOG.md index 278a6f5fb..5d8739bb8 100644 --- a/ombi/CHANGELOG.md +++ b/ombi/CHANGELOG.md @@ -1,11 +1,15 @@ +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - New standardized logic for Dockerfile build and packages installation ## 4.3.3 (07-11-2021) + - Update to latest version from linuxserver/docker-ombi ## 4.0.1468 (26-08-2021) + - Update to latest version from linuxserver/docker-ombi ## 4.0.1430 (25-07-2021) + - Update to latest version from linuxserver/docker-ombi - Initial release diff --git a/ombi/Dockerfile b/ombi/Dockerfile index fb88978df..96da037e4 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -28,9 +28,9 @@ RUN \ && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ \ # Correct config folder - && grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/ombi|g' || true \ - && grep -rl "/config" /etc/services.d | xargs sed -i 's|/config|/config/ombi|g' || true \ - && sed -i 's=/config/ombi=/config/ombi || true=g' /etc/cont-init.d/10-adduser || true + && grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/ombi|g' || true \ + && grep -rl "/config" /etc/services.d | xargs sed -i 's|/config|/config/addons_config/ombi|g' || true \ + && sed -i 's=/config/ombi=/config/addons_config/ombi || true=g' /etc/cont-init.d/10-adduser || true ################## # 3 Install apps # diff --git a/ombi/rootfs/etc/cont-init.d/20-folders.sh b/ombi/rootfs/etc/cont-init.d/20-folders.sh new file mode 100644 index 000000000..dbb3e91fe --- /dev/null +++ b/ombi/rootfs/etc/cont-init.d/20-folders.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bash + +slug=ombi + +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 diff --git a/paperless_ng/CHANGELOG.md b/paperless_ng/CHANGELOG.md index 0cc50eb6e..92960980b 100644 --- a/paperless_ng/CHANGELOG.md +++ b/paperless_ng/CHANGELOG.md @@ -1,3 +1,4 @@ +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - MultiOCR: in OCRLANG field use comma separated value. Ex: fra,deu (working) - Manual install pikepdf - New standardized logic for Dockerfile build and packages installation diff --git a/paperless_ng/Dockerfile b/paperless_ng/Dockerfile index 97f0dd943..48798e367 100644 --- a/paperless_ng/Dockerfile +++ b/paperless_ng/Dockerfile @@ -21,7 +21,7 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## -ENV PAPERLESS_DATA_DIR=/config/paperless_ng +ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng RUN \ ################# # Correct image # diff --git a/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh b/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh new file mode 100644 index 000000000..c061e6611 --- /dev/null +++ b/paperless_ng/rootfs/etc/cont-init.d/20-folders.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bash + +slug=paperless + +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 diff --git a/prowlarr/CHANGELOG.md b/prowlarr/CHANGELOG.md index 522384dba..bbf429a80 100644 --- a/prowlarr/CHANGELOG.md +++ b/prowlarr/CHANGELOG.md @@ -1,115 +1,152 @@ -- Cleanup: config base folder changed to /config/addons_config +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) ## nightly-alpine-0.1.9.1313-ls2 (29-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.9.1276-ls237 (25-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.8.1269-ls234 (24-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.8.1265-ls233 (20-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.8.1259-ls230 (16-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.8.1253-ls229 (14-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.8.1238-ls228 (12-12-2021) + - Update to latest version from linuxserver/docker-prowlarr - New standardized logic for Dockerfile build and packages installation ## nightly-0.1.8.1232-ls226 (10-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.8.1223-ls224 (09-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.8.1212-ls220 (07-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.8.1210-ls218 (07-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## develop-0.1.6.1184-ls30 (03-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.6.1177-ls210 (02-12-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.6.1176-ls209 (30-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.6.1165-ls205 (30-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1147-ls196 (27-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1145-ls195 (26-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1143-ls194 (25-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1139-ls192 (24-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1133-ls190 (23-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1130-ls189 (23-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1126-ls187 (22-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1120-ls186 (21-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.4.1117-ls184 (20-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.3.1113-ls183 (20-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.3.1102-ls178 (18-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.3.1089-ls176 (17-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.3.1077-ls175 (15-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## develop-0.1.2.1060-ls24 (13-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.2.1058-ls173 (11-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.2.1054-ls170 (09-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.2.1046-ls168 (07-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.2.1045-ls167 (05-11-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.2.1042-ls166 (31-10-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.2.1039-ls164 (29-10-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.2.1037-ls163 (28-10-2021) + - Update to latest version from linuxserver/docker-prowlarr ## nightly-0.1.1.1030-ls162 (26-10-2021) + - Update to latest version from linuxserver/docker-prowlarr - Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index 35eb5e419..bac68af71 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,3 +1,4 @@ +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - Removed watchdog - New standardized logic for Dockerfile build and packages installation - Allow mounting nvme diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 5c6dabbc5..995781b3a 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -37,8 +37,8 @@ RUN \ && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ \ # Correct permissions - && sed -i 's=/config=/config/qBittorrent || true=g' /etc/cont-init.d/10-adduser \ - && sed -i 's= /config=/config/qBittorrent || true=g' /etc/cont-init.d/30-config \ + && sed -i 's=/config=/config/addons_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 \ \ # Set download folder to /share && sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \ diff --git a/qbittorrent/rootfs/etc/cont-init.d/20-folders.sh b/qbittorrent/rootfs/etc/cont-init.d/20-folders.sh new file mode 100644 index 000000000..d35716b37 --- /dev/null +++ b/qbittorrent/rootfs/etc/cont-init.d/20-folders.sh @@ -0,0 +1,16 @@ +#!/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 diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh index 9613e74b2..77375d05e 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -5,7 +5,7 @@ ########## # Define preferences line -cd /config/qBittorrent/ +cd /config/addon_config/qBittorrent/ LINE=$(sed -n '/Preferences/=' qBittorrent.conf) LINE=$((LINE + 1)) @@ -19,7 +19,7 @@ if bashio::config.has_value 'run_duration'; then chmod +x /etc/services.d/qbittorrent/run else rm /etc/services.d/qbittorrent/timer -fi +fi ################## # Default folder # @@ -59,7 +59,7 @@ if bashio::config.true 'ssl'; then #set variables CERTFILE=$(bashio::config 'certfile') KEYFILE=$(bashio::config 'keyfile') - + #Modify configuration sed -i "$LINE i\WebUI\\\HTTPS\\\Enabled=True" qBittorrent.conf sed -i "$LINE i\WebUI\\\HTTPS\\\CertificatePath=/ssl/$CERTFILE" qBittorrent.conf @@ -70,7 +70,7 @@ fi # WHITELIST # ################ -cd /config/qBittorrent/ +cd /config/addon_config/qBittorrent/ if bashio::config.has_value 'whitelist'; then WHITELIST=$(bashio::config 'whitelist') #clean data @@ -84,7 +84,7 @@ fi # USERNAME # ############### -cd /config/qBittorrent/ +cd /config/addon_config/qBittorrent/ if bashio::config.has_value 'Username'; then USERNAME=$(bashio::config 'Username') #clean data @@ -112,7 +112,7 @@ if bashio::config.has_value 'customUI'; then ### Download WebUI case $CUSTOMUI in - "vuetorrent") + "vuetorrent") curl -s -S -J -L -o /webui/release.zip $(curl -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | grep -o "http.*vuetorrent.zip") >/dev/null ;; @@ -131,11 +131,11 @@ if bashio::config.has_value 'customUI'; then rm /webui/*.zip CUSTOMUIDIR="$(dirname "$(find /webui/$CUSTOMUI -iname "public" -type d)")" # Set qbittorrent - sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/qBittorrent/qBittorrent.conf - sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/qBittorrent/qBittorrent.conf + sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/addon_config/qBittorrent/qBittorrent.conf + sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/addon_config/qBittorrent/qBittorrent.conf # Set nginx - #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=/vuetorrent/public/=$CUSTOMUIDIR/public/=g" /etc/nginx/servers/ingress.conf + #sed -i "s=vue.torrent=$CUSTOMUI.torrent=g" /etc/nginx/servers/ingress.conf fi @@ -144,4 +144,4 @@ fi ########## 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/addon_config/qBittorrent" diff --git a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh index 37dd165ef..66d794232 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh @@ -6,28 +6,28 @@ declare openvpn_username declare openvpn_password if bashio::config.true 'openvpn_enabled'; then - + bashio::log.info "Configuring openvpn" ##################### # CONFIGURE OPENVPN # ##################### - + openvpn_config=$(bashio::config 'openvpn_config') - cp "/config/openvpn/${openvpn_config}" /etc/openvpn/config.ovpn || bashio::log.error "openvpn config file not found in /config/openvpn/${openvpn_config}" + cp "/config/openvpn/${openvpn_config}" /etc/openvpn/config.ovpn || bashio::log.error "openvpn config file not found in /config/openvpn/${openvpn_config}" openvpn_username=$(bashio::config 'openvpn_username') - echo "${openvpn_username}" > /etc/openvpn/credentials + echo "${openvpn_username}" >/etc/openvpn/credentials openvpn_password=$(bashio::config 'openvpn_password') - echo "${openvpn_password}" >> /etc/openvpn/credentials + echo "${openvpn_password}" >>/etc/openvpn/credentials sed -i 's/auth-user-pass.*/auth-user-pass \/etc\/openvpn\/credentials/g' /etc/openvpn/config.ovpn - + # Permissions chmod 600 /etc/openvpn/credentials chmod 755 /etc/openvpn/up.sh chmod 755 /etc/openvpn/down.sh - chmod 755 /etc/openvpn/up-qbittorrent.sh + chmod 755 /etc/openvpn/up-qbittorrent.sh chmod +x /etc/openvpn/up.sh chmod +x /etc/openvpn/up-qbittorrent.sh @@ -36,24 +36,24 @@ if bashio::config.true 'openvpn_enabled'; then ######################### # CONFIGURE QBITTORRENT # ######################### - - QBT_CONFIG_FILE="/config/qBittorrent/qBittorrent.conf" + + QBT_CONFIG_FILE="/config/addon_config/qBittorrent/qBittorrent.conf" # Define preferences line - cd /config/qBittorrent/ + cd /config/addon_config/qBittorrent/ LINE=$(sed -n '/Preferences/=' qBittorrent.conf) LINE=$((LINE + 1)) - + # If qBittorrent.conf exists - if [ -f "$QBT_CONFIG_FILE" ]; then - # Remove previous line and bind tun0 - sed -i '/Interface/d' qBittorrent.conf - # sed -i '/PortRangeMin/d' qBittorrent.conf - # Bind tun0 - # sed -i "$LINE i\Connection\\\Interface=tun0" qBittorrent.conf - # sed -i "$LINE i\Connection\\\InterfaceName=tun0" qBittorrent.conf + if [ -f "$QBT_CONFIG_FILE" ]; then + # Remove previous line and bind tun0 + sed -i '/Interface/d' qBittorrent.conf + # sed -i '/PortRangeMin/d' qBittorrent.conf + # Bind tun0 + # sed -i "$LINE i\Connection\\\Interface=tun0" qBittorrent.conf + # sed -i "$LINE i\Connection\\\InterfaceName=tun0" qBittorrent.conf else - bashio::log.error "qBittorrent config file doesn't exist, openvpn must be added manually to qbittorrent options " - exit 1 + bashio::log.error "qBittorrent config file doesn't exist, openvpn must be added manually to qbittorrent options " + exit 1 fi ##################### @@ -61,13 +61,13 @@ if bashio::config.true 'openvpn_enabled'; then ##################### if bashio::config.true 'openvpn_alternative_mode'; then - # Remove previous line and bind tun0 - sed -i '/Interface/d' qBittorrent.conf - # Bind tun0 - sed -i "$LINE i\Connection\\\Interface=tun0" qBittorrent.conf - sed -i "$LINE i\Connection\\\InterfaceName=tun0" qBittorrent.conf - # Modify ovpn config - echo "route-nopull" >> /etc/openvpn/config.ovpn + # Remove previous line and bind tun0 + sed -i '/Interface/d' qBittorrent.conf + # Bind tun0 + sed -i "$LINE i\Connection\\\Interface=tun0" qBittorrent.conf + sed -i "$LINE i\Connection\\\InterfaceName=tun0" qBittorrent.conf + # Modify ovpn config + echo "route-nopull" >>/etc/openvpn/config.ovpn fi else @@ -76,8 +76,8 @@ else # REMOVE OPENVPN # ################## # Ensure no redirection by removing the direction tag - cd /config/qBittorrent/ - sed -i '/Interface/d' qBittorrent.conf + cd /config/addon_config/qBittorrent/ + sed -i '/Interface/d' qBittorrent.conf bashio::log.info "Direct connection without VPN enabled" fi diff --git a/radarr/CHANGELOG.md b/radarr/CHANGELOG.md index 1ddc5b44b..1e621b330 100644 --- a/radarr/CHANGELOG.md +++ b/radarr/CHANGELOG.md @@ -1,4 +1,4 @@ -- Cleanup: config base folder changed to /config/addons_config +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - New standardized logic for Dockerfile build and packages installation - Allow mounting local drives by label. Just pust the label instead of sda1 for example - Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md index 48ec508ca..c578f2385 100644 --- a/readarr/CHANGELOG.md +++ b/readarr/CHANGELOG.md @@ -1,77 +1,101 @@ -- Cleanup: config base folder changed to /config/addons_config +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) ## nightly-0.1.0.1149-ls59 (28-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1144-ls58 (25-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1142-ls56 (20-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1137-ls55 (18-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1133-ls54 (16-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1126-ls53 (16-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1117-ls52 (12-12-2021) + - Update to latest version from linuxserver/docker-readarr - New standardized logic for Dockerfile build and packages installation - Allow to define the config location ## nightly-0.1.0.1095-ls51 (09-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1092-ls50 (09-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1085-ls49 (07-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1083-ls48 (03-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1081-ls46 (03-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1072-ls42 (02-12-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1071-ls41 (30-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1060-ls39 (24-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1054-ls37 (24-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1053-ls36 (23-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1050-ls35 (20-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1041-ls34 (17-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1035-ls33 (15-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1024-ls29 (14-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1019-ls28 (13-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1011-ls25 (11-11-2021) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1006-ls24 (07-11-2021) + - Update to latest version from linuxserver/docker-readarr - Allow mounting local drives by label. Just pust the label instead of sda1 for example diff --git a/resiliosync/CHANGELOG.md b/resiliosync/CHANGELOG.md index f71437092..2804d8b42 100644 --- a/resiliosync/CHANGELOG.md +++ b/resiliosync/CHANGELOG.md @@ -1,3 +1,4 @@ +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - New standardized logic for Dockerfile build and packages installation - Add local & smb mounts (see readme) - Config changed from /config/resiliosync to /share/resiliosync_config diff --git a/sonarr/CHANGELOG.md b/sonarr/CHANGELOG.md index de6e76944..90444a83e 100644 --- a/sonarr/CHANGELOG.md +++ b/sonarr/CHANGELOG.md @@ -1,4 +1,4 @@ -- Cleanup: config base folder changed to /config/addons_config +- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv) - New standardized logic for Dockerfile build and packages installation - Allow mounting local drives by label. Just pust the label instead of sda1 for example - Allow mounting local drives by label. Just pust the label instead of sda1 for example diff --git a/ubooquity/rootfs/etc/32-nginx_ingress.sh b/ubooquity/rootfs/etc/32-nginx_ingress.sh index e93de8491..7493d3e39 100644 --- a/ubooquity/rootfs/etc/32-nginx_ingress.sh +++ b/ubooquity/rootfs/etc/32-nginx_ingress.sh @@ -16,7 +16,7 @@ if [ $port > 1 ]; then sed -i "s|%%port%%|$port|g" /etc/nginx/servers/ingress.conf sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ingress.conf # Removebaseurl - jq '.reverseProxyPrefix = ""' /config/ubooquity/preferences.json | sponge /config/ubooquity/preferences.json + jq '.reverseProxyPrefix = ""' /config/addon_config/ubooquity/preferences.json | sponge /config/addon_config/ubooquity/preferences.json # Log bashio::log.info "Ingress enabled" else diff --git a/ubooquity/rootfs/etc/cont-init.d/20-folders.sh b/ubooquity/rootfs/etc/cont-init.d/20-folders.sh new file mode 100644 index 000000000..e1e53b92b --- /dev/null +++ b/ubooquity/rootfs/etc/cont-init.d/20-folders.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bash + +slug=ubooquity + +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 diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh index 9dc44234e..cda80e605 100644 --- a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh +++ b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh @@ -3,9 +3,9 @@ ########### # FOLDERS # ########### -FILES=$(jq ".filesPaths[0].pathString" /config/ubooquity/preferences.json) -COMICS=$(jq ".comicsPaths[0].pathString" /config/ubooquity/preferences.json) -BOOKS=$(jq ".booksPaths[0].pathString" /config/ubooquity/preferences.json) +FILES=$(jq ".filesPaths[0].pathString" /config/addon_config/ubooquity/preferences.json) +COMICS=$(jq ".comicsPaths[0].pathString" /config/addon_config/ubooquity/preferences.json) +BOOKS=$(jq ".booksPaths[0].pathString" /config/addon_config/ubooquity/preferences.json) -mkdir -p $FILES $COMICS $BOOKS /config/ubooquity || true -chown -R abc:abc $FILES $COMICS $BOOKS /config/ubooquity || true +mkdir -p $FILES $COMICS $BOOKS /config/addon_config/ubooquity || true +chown -R abc:abc $FILES $COMICS $BOOKS /config/addon_config/ubooquity || true diff --git a/ubooquity/rootfs/etc/cont-init.d/93-custom_webUI.sh b/ubooquity/rootfs/etc/cont-init.d/93-custom_webUI.sh index 71f1cdc44..e5977b596 100644 --- a/ubooquity/rootfs/etc/cont-init.d/93-custom_webUI.sh +++ b/ubooquity/rootfs/etc/cont-init.d/93-custom_webUI.sh @@ -13,13 +13,13 @@ if bashio::config.has_value 'theme'; then case $CUSTOMUI in "comixology2") curl -s -S -J -L -o /data/release.zip https://github.com/scooterpsu/Comixology_Ubooquity_2/releases/download/v3.4/comixology2.zip >/dev/null && - unzip -o -q /data/release.zip -d /config/ubooquity/themes/ + unzip -o -q /data/release.zip -d /config/addon_config/ubooquity/themes/ ;; "plextheme-master") curl -s -S -J -L -o /data/release.zip https://github.com/FinalAngel/plextheme/archive/master.zip >/dev/null && - unzip -q /data/release.zip -d /config/ubooquity/themes/ - # && mv /config/ubooquity/themes/plextheme-master/ /config/ubooquity/themes/ + unzip -q /data/release.zip -d /config/addon_config/ubooquity/themes/ + # && mv /config/addon_config/ubooquity/themes/plextheme-master/ /config/addon_config/ubooquity/themes/ ;; esac @@ -28,6 +28,6 @@ if bashio::config.has_value 'theme'; then rm /data/release.zip || true ### Set preference - jq --arg variable $CUSTOMUI '.theme = $variable' /config/ubooquity/preferences.json | sponge /config/ubooquity/preferences.json + jq --arg variable $CUSTOMUI '.theme = $variable' /config/addon_config/ubooquity/preferences.json | sponge /config/addon_config/ubooquity/preferences.json fi