From 76a5d6972a517eee9fb7149b528dd09d1316786d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:19:05 +0100 Subject: [PATCH 01/37] Update config.json --- ubooquity/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubooquity/config.json b/ubooquity/config.json index 87a38bd21..2e763f283 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -30,7 +30,7 @@ "share:rw", "ssl" ], - "webui": "[PROTO:ssl]://[HOST]:[PORT:2202]", + "webui": "[PROTO:ssl]://[HOST]:[PORT:2203]", "boot": "auto", "environment": { "MAXMEM": "512" @@ -47,4 +47,4 @@ "cifspassword": "str?", "TZ": "str?" } -} \ No newline at end of file +} From 6041addd44c58da90e3a5869f04882d002ca0cf1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:20:10 +0100 Subject: [PATCH 02/37] Update README.md --- ubooquity/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubooquity/README.md b/ubooquity/README.md index f7011ae9d..cd162c996 100644 --- a/ubooquity/README.md +++ b/ubooquity/README.md @@ -34,7 +34,7 @@ cifspassword: "password" # smb password (optional) ``` ## Support -Create an issue on github +Create an issue on the [repository github][repository] [repository]: https://github.com/alexbelgium/hassio-addons [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg From cf3989e4ad2772409268a94f25d7a3feb9b68d59 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:21:20 +0100 Subject: [PATCH 03/37] Update config.json --- ubooquity/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubooquity/config.json b/ubooquity/config.json index 2e763f283..5a13270fc 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -33,7 +33,7 @@ "webui": "[PROTO:ssl]://[HOST]:[PORT:2203]", "boot": "auto", "environment": { - "MAXMEM": "512" + "MAXMEM": "250" }, "options": { "PUID": 0, From 07a06e402643fcccc91f53ae9586f8660e14b0ef Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:22:50 +0100 Subject: [PATCH 04/37] Update config.json --- ubooquity/config.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ubooquity/config.json b/ubooquity/config.json index 5a13270fc..3784b3b14 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -37,11 +37,13 @@ }, "options": { "PUID": 0, - "PGID": 0 + "PGID": 0, + "maxmem": 120 }, "schema": { "PUID": "int", "PGID": "int", + "maxmem": "int", "networkdisks": "str?", "cifsusername": "str?", "cifspassword": "str?", From d633a30b0f8fd9e3eb09fde3e64fc9be079426cc Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:22:59 +0100 Subject: [PATCH 05/37] Update config.json --- ubooquity/config.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ubooquity/config.json b/ubooquity/config.json index 3784b3b14..0b570b829 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -33,7 +33,6 @@ "webui": "[PROTO:ssl]://[HOST]:[PORT:2203]", "boot": "auto", "environment": { - "MAXMEM": "250" }, "options": { "PUID": 0, From b885de8fc9082c4374981b6d49868aa335aae0e5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:24:05 +0100 Subject: [PATCH 06/37] Update Dockerfile --- ubooquity/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index aee8059ed..8419084eb 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -24,6 +24,9 @@ RUN apk add --no-cache \ && 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 \ + # Allow maximum memory setting + && sed -i 's/bash/bashio/g' /etc/services.d/ubooquity/run \ + && sed -i 's/${MAXMEM:-512}/(bashio::config "maxmem")/g' /etc/services.d/ubooquity/run \ # # Set default folders && sed -i 's|/files|/share/ubooquity/files/|g' /defaults/preferences.json \ && sed -i 's|/comics|/share/ubooquity/comics|g' /defaults/preferences.json \ @@ -31,4 +34,4 @@ RUN apk add --no-cache \ && sed -i 's|config|config/ubooquity|g' /etc/cont-init.d/30-config \ && sed -i 's|config|config/ubooquity|g' /etc/services.d/ubooquity/run -VOLUME [ "/data" ] \ No newline at end of file +VOLUME [ "/data" ] From 5c390373234a1a0c802a66b180e02fb5dbf113bd Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:31:56 +0100 Subject: [PATCH 07/37] Update config.json --- ubooquity/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubooquity/config.json b/ubooquity/config.json index 0b570b829..a1db71144 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -30,7 +30,7 @@ "share:rw", "ssl" ], - "webui": "[PROTO:ssl]://[HOST]:[PORT:2203]", + "webui": "[PROTO:ssl]://[HOST]:[PORT:2203]/ubooquity/admin", "boot": "auto", "environment": { }, From 49fa9b06bbc41b912550f3c660c7542812ef8b74 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:38:46 +0100 Subject: [PATCH 08/37] Update config.json --- ubooquity/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubooquity/config.json b/ubooquity/config.json index a1db71144..f26270127 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -37,12 +37,12 @@ "options": { "PUID": 0, "PGID": 0, - "maxmem": 120 + "maxmem": "120m" }, "schema": { "PUID": "int", "PGID": "int", - "maxmem": "int", + "maxmem": "str", "networkdisks": "str?", "cifsusername": "str?", "cifspassword": "str?", From 7e1ef423c177c342092dbbf49ea1daae95d02b95 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:46:44 +0100 Subject: [PATCH 09/37] Update config.json --- ubooquity/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubooquity/config.json b/ubooquity/config.json index f26270127..a1db71144 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -37,12 +37,12 @@ "options": { "PUID": 0, "PGID": 0, - "maxmem": "120m" + "maxmem": 120 }, "schema": { "PUID": "int", "PGID": "int", - "maxmem": "str", + "maxmem": "int", "networkdisks": "str?", "cifsusername": "str?", "cifspassword": "str?", From 0d33adb60b450fe9d6541b725ea65da8088231c7 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:48:15 +0100 Subject: [PATCH 10/37] Update Dockerfile --- ubooquity/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 8419084eb..231dee377 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -26,7 +26,7 @@ RUN apk add --no-cache \ && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ # Allow maximum memory setting && sed -i 's/bash/bashio/g' /etc/services.d/ubooquity/run \ - && sed -i 's/${MAXMEM:-512}/(bashio::config "maxmem")/g' /etc/services.d/ubooquity/run \ + && sed -i 's/{MAXMEM:-512}/(bashio::config "maxmem")/g' /etc/services.d/ubooquity/run \ # # Set default folders && sed -i 's|/files|/share/ubooquity/files/|g' /defaults/preferences.json \ && sed -i 's|/comics|/share/ubooquity/comics|g' /defaults/preferences.json \ From 34b2ba4e0af356f363738f3764d9b5eb1769f2f1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:51:01 +0100 Subject: [PATCH 11/37] Update Dockerfile --- ubooquity/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 231dee377..4568ca3e0 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -21,12 +21,12 @@ RUN apk add --no-cache \ && rm -fr /tmp/bashio.tar.gz \ \ # 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 \ + && 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 \ # Allow maximum memory setting - && sed -i 's/bash/bashio/g' /etc/services.d/ubooquity/run \ - && sed -i 's/{MAXMEM:-512}/(bashio::config "maxmem")/g' /etc/services.d/ubooquity/run \ + && sed -i 's|bash|bashio|g' /etc/services.d/ubooquity/run \ + && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/services.d/ubooquity/run \ # # Set default folders && sed -i 's|/files|/share/ubooquity/files/|g' /defaults/preferences.json \ && sed -i 's|/comics|/share/ubooquity/comics|g' /defaults/preferences.json \ From a46bcfd0d08f0addb5af67bce76cca7e749e99eb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:05:54 +0100 Subject: [PATCH 12/37] Update Dockerfile --- ubooquity/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 4568ca3e0..603301ed2 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -27,11 +27,8 @@ RUN apk add --no-cache \ # Allow maximum memory setting && sed -i 's|bash|bashio|g' /etc/services.d/ubooquity/run \ && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/services.d/ubooquity/run \ - # # Set default folders - && sed -i 's|/files|/share/ubooquity/files/|g' /defaults/preferences.json \ - && sed -i 's|/comics|/share/ubooquity/comics|g' /defaults/preferences.json \ - && sed -i 's|/books|/share/ubooquity/books|g' /defaults/preferences.json \ + # Set config directory && sed -i 's|config|config/ubooquity|g' /etc/cont-init.d/30-config \ && sed -i 's|config|config/ubooquity|g' /etc/services.d/ubooquity/run - + VOLUME [ "/data" ] From 723995384ed8a978cb32b63cc5200ef28cbff571 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:14:54 +0100 Subject: [PATCH 13/37] Update 91-configuration.sh --- .../rootfs/etc/cont-init.d/91-configuration.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh index 5e25bde4f..8de906c3c 100644 --- a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh +++ b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh @@ -1,3 +1,16 @@ #!/usr/bin/with-contenv bashio -# Empty \ No newline at end of file +########### +# FOLDERS # +########### +FILES=&(bashio::config "FilesFolder") +COMICS=&(bashio::config "ComicsFolder") +BOOKS=&(bashio::config "BooksFolder") + +jq ".filesPaths.pathString = $FILES" /config/ubooquity/preferences.json +jq ".comicsPaths.pathString = $COMICS" /config/ubooquity/preferences.json +jq ".booksPaths.pathString = $BOOKS" /config/ubooquity/preferences.json + +mkdir -p FILES COMICS BOOKS + +bashio::log.info "Default folders set. Files : $FILES ; Comics : $COMICS ; Books : $BOOKS" From 6192226c559165f0df681e7766cd8812f8e6d241 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:15:53 +0100 Subject: [PATCH 14/37] Update 91-configuration.sh --- ubooquity/rootfs/etc/cont-init.d/91-configuration.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh index 8de906c3c..8c227d18d 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=&(bashio::config "FilesFolder") -COMICS=&(bashio::config "ComicsFolder") -BOOKS=&(bashio::config "BooksFolder") +FILES=$(bashio::config "FilesFolder") +COMICS=$(bashio::config "ComicsFolder") +BOOKS=$(bashio::config "BooksFolder") jq ".filesPaths.pathString = $FILES" /config/ubooquity/preferences.json jq ".comicsPaths.pathString = $COMICS" /config/ubooquity/preferences.json From d92b1ee4b6f8a2d087c052489c4e5b16f2f8d4d1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:17:09 +0100 Subject: [PATCH 15/37] Update config.json --- ubooquity/config.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubooquity/config.json b/ubooquity/config.json index a1db71144..a755c53be 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -37,11 +37,17 @@ "options": { "PUID": 0, "PGID": 0, + "FilesFolder": "/share/ubooquity/files", + "ComicsFolder": "/share/ubooquity/comics", + "BooksFolder": "/share/ubooquity/books", "maxmem": 120 }, "schema": { "PUID": "int", "PGID": "int", + "FilesFolder": "str", + "ComicsFolder": "str", + "BooksFolder": "str", "maxmem": "int", "networkdisks": "str?", "cifsusername": "str?", From b71e47091b3bc1df47091a6493840c9cf4019b07 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:27:52 +0100 Subject: [PATCH 16/37] Update Dockerfile --- ubooquity/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 603301ed2..c39479132 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -24,11 +24,11 @@ RUN apk add --no-cache \ && 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 \ + # Set config directory + && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/30-config \ + && sed -i 's|/config|/config/ubooquity|g' /etc/services.d/ubooquity/run \ # Allow maximum memory setting && sed -i 's|bash|bashio|g' /etc/services.d/ubooquity/run \ - && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/services.d/ubooquity/run \ - # Set config directory - && sed -i 's|config|config/ubooquity|g' /etc/cont-init.d/30-config \ - && sed -i 's|config|config/ubooquity|g' /etc/services.d/ubooquity/run - + && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/services.d/ubooquity/run + VOLUME [ "/data" ] From 0dac32d845be2aa55d5339fbb4be641abfcdd71d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:28:02 +0100 Subject: [PATCH 17/37] Update Dockerfile --- ubooquity/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index c39479132..15a049eae 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -10,7 +10,7 @@ RUN apk add --no-cache \ curl \ jq \ && curl -J -L -o /tmp/bashio.tar.gz \ - "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ + "https://github.com/hassio-addons/bashio/archive/v0.10.1.tar.gz" \ && mkdir /tmp/bashio \ && tar zxvf \ /tmp/bashio.tar.gz \ From f20955c1680d329bc328129f5d96d88f0560b724 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:47:50 +0100 Subject: [PATCH 18/37] Update 91-configuration.sh --- .../rootfs/etc/cont-init.d/91-configuration.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh index 8c227d18d..8eae4f363 100644 --- a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh +++ b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh @@ -3,13 +3,17 @@ ########### # FOLDERS # ########### -FILES=$(bashio::config "FilesFolder") -COMICS=$(bashio::config "ComicsFolder") -BOOKS=$(bashio::config "BooksFolder") +FILES='"'$(bashio::config "FilesFolder")'"' +COMICS='"'$(bashio::config "ComicsFolder")'"' +BOOKS='"'$(bashio::config "BooksFolder")'"' -jq ".filesPaths.pathString = $FILES" /config/ubooquity/preferences.json -jq ".comicsPaths.pathString = $COMICS" /config/ubooquity/preferences.json -jq ".booksPaths.pathString = $BOOKS" /config/ubooquity/preferences.json +CURRENTFILES=$(jq ".filesPaths[0].pathString" /config/ubooquity/preferences.json) +CURRENTCOMICS=$(jq ".comicsPaths[0].pathString" /config/ubooquity/preferences.json) +CURRENTBOOKS=$(jq ".booksPaths[0].pathString" /config/ubooquity/preferences.json) + +sed -i "s|$CURRENTFILES|$FILES|g" /config/ubooquity/preferences.json +sed -i "s|$CURRENTCOMICS|$COMICS|g" /config/ubooquity/preferences.json +sed -i "s|$CURRENTBOOKS|$BOOKS|g" /config/ubooquity/preferences.json mkdir -p FILES COMICS BOOKS From 25d22505f9d4638a0c102e6010557457ef829d01 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:09:12 +0100 Subject: [PATCH 19/37] Update Dockerfile --- ubooquity/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 15a049eae..ba2948c6b 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -27,8 +27,14 @@ RUN apk add --no-cache \ # Set config directory && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/30-config \ && sed -i 's|/config|/config/ubooquity|g' /etc/services.d/ubooquity/run \ + # Set default directory + && sed -i 's|/files|/share/ubooquity/files|g' /defaults/preferences.json \ + && sed -i 's|/comics|/share/ubooquity/comics|g' /defaults/preferences.json \ + && sed -i 's|/books|/share/ubooquity/books|g' /defaults/preferences.json \ + && mkdir -p /share/ubooquity/files /share/ubooquity/comics /share/ubooquity/books \ # Allow maximum memory setting && sed -i 's|bash|bashio|g' /etc/services.d/ubooquity/run \ && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/services.d/ubooquity/run VOLUME [ "/data" ] +VOLUME [ "/share" ] From 55276d72a7e795c9f34c2ebf1ce974fc510aaeac Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:09:34 +0100 Subject: [PATCH 20/37] Update 91-configuration.sh --- .../etc/cont-init.d/91-configuration.sh | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh index 8eae4f363..e2e6d9534 100644 --- a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh +++ b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh @@ -3,18 +3,18 @@ ########### # FOLDERS # ########### -FILES='"'$(bashio::config "FilesFolder")'"' -COMICS='"'$(bashio::config "ComicsFolder")'"' -BOOKS='"'$(bashio::config "BooksFolder")'"' +#FILES='"'$(bashio::config "FilesFolder")'"' +#COMICS='"'$(bashio::config "ComicsFolder")'"' +#BOOKS='"'$(bashio::config "BooksFolder")'"' -CURRENTFILES=$(jq ".filesPaths[0].pathString" /config/ubooquity/preferences.json) -CURRENTCOMICS=$(jq ".comicsPaths[0].pathString" /config/ubooquity/preferences.json) -CURRENTBOOKS=$(jq ".booksPaths[0].pathString" /config/ubooquity/preferences.json) +#CURRENTFILES=$(jq ".filesPaths[0].pathString" /config/ubooquity/preferences.json) +#CURRENTCOMICS=$(jq ".comicsPaths[0].pathString" /config/ubooquity/preferences.json) +#CURRENTBOOKS=$(jq ".booksPaths[0].pathString" /config/ubooquity/preferences.json) -sed -i "s|$CURRENTFILES|$FILES|g" /config/ubooquity/preferences.json -sed -i "s|$CURRENTCOMICS|$COMICS|g" /config/ubooquity/preferences.json -sed -i "s|$CURRENTBOOKS|$BOOKS|g" /config/ubooquity/preferences.json +#sed -i "s|$CURRENTFILES|$FILES|g" /config/ubooquity/preferences.json +#sed -i "s|$CURRENTCOMICS|$COMICS|g" /config/ubooquity/preferences.json +#sed -i "s|$CURRENTBOOKS|$BOOKS|g" /config/ubooquity/preferences.json -mkdir -p FILES COMICS BOOKS +#mkdir -p FILES COMICS BOOKS -bashio::log.info "Default folders set. Files : $FILES ; Comics : $COMICS ; Books : $BOOKS" +#bashio::log.info "Default folders set. Files : $FILES ; Comics : $COMICS ; Books : $BOOKS" From b2425605a53f275ebf725429c23dba1c20bea54d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:10:13 +0100 Subject: [PATCH 21/37] Update Dockerfile --- ubooquity/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index ba2948c6b..fd000bcea 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -5,6 +5,9 @@ FROM ${BUILD_FROM}${BUILD_VERSION} # Copy root filesystem COPY rootfs / +VOLUME [ "/data" ] +VOLUME [ "/share" ] + # Add bashio RUN apk add --no-cache \ curl \ @@ -35,6 +38,3 @@ RUN apk add --no-cache \ # Allow maximum memory setting && sed -i 's|bash|bashio|g' /etc/services.d/ubooquity/run \ && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/services.d/ubooquity/run - -VOLUME [ "/data" ] -VOLUME [ "/share" ] From 241949a8739769e03c00382d058e55e3d9250f10 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:28:39 +0100 Subject: [PATCH 22/37] Update config.json --- ubooquity/config.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ubooquity/config.json b/ubooquity/config.json index a755c53be..a1db71144 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -37,17 +37,11 @@ "options": { "PUID": 0, "PGID": 0, - "FilesFolder": "/share/ubooquity/files", - "ComicsFolder": "/share/ubooquity/comics", - "BooksFolder": "/share/ubooquity/books", "maxmem": 120 }, "schema": { "PUID": "int", "PGID": "int", - "FilesFolder": "str", - "ComicsFolder": "str", - "BooksFolder": "str", "maxmem": "int", "networkdisks": "str?", "cifsusername": "str?", From a374d6a6acad67a8153180723bda3451f0aa9321 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:30:03 +0100 Subject: [PATCH 23/37] Update README.md --- ubooquity/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ubooquity/README.md b/ubooquity/README.md index cd162c996..c0e5b328f 100644 --- a/ubooquity/README.md +++ b/ubooquity/README.md @@ -28,6 +28,7 @@ Network disk is mounted to /share/storagecifs ```yaml GUID: user GPID: user +maxmem: 300 # The quantity of memory allocated to Ubooquity depends on the hardware your are running it on. If this quantity is too small, you might sometime saturate it with when performing memory intensive operations. That’s when you get java.lang.OutOfMemoryError: Java heap space errors. You can explicitly set the amount of memory Ubooquity is allowed to use (be careful to set a value lower than the actual physical memory of your hardware). Value is a number of megabytes ( put just a number, without MB ) networkdisks: "" # list of smbv2/3 servers to mount (optional) cifsusername: "username" # smb username (optional) cifspassword: "password" # smb password (optional) From 189d9f14158b4258973ec08f736371af8f9a0ca9 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:31:47 +0100 Subject: [PATCH 24/37] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index cc2dcfdfe..f7ef20a54 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,10 @@ https://github.com/alexbelgium/hassio-addons - The torrent client for Hass.io. - Based on https://hub.docker.com/r/linuxserver/transmission +### ✓ [Ubooquity](ubooquity/) ![smb][smb-shield] +- Free, lightweight and easy-to-use home server for your comics and ebooks +- Based on https://hub.docker.com/r/linuxserver/ubooquity + [//]: # (ADDONLIST_END) [stale-shield]: https://img.shields.io/badge/Stale--orange From 1c357493df5820626518aec433037a9f64b90d5b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:32:45 +0100 Subject: [PATCH 25/37] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f7ef20a54..2e2a9c993 100644 --- a/README.md +++ b/README.md @@ -83,8 +83,8 @@ https://github.com/alexbelgium/hassio-addons [//]: # (ADDONLIST_END) -[stale-shield]: https://img.shields.io/badge/Stale--orange +[stale-shield]: https://img.shields.io/badge/Stale--orange.svg [smb-shield]: https://img.shields.io/badge/SMB--green?style=plastic.svg -[sql-shield]: https://img.shields.io/badge/SQL--green +[sql-shield]: https://img.shields.io/badge/SQL-external-orange.svg [privileged-shield]: https://img.shields.io/badge/privileged-required-orange.svg From 4d8e97f3aa2724315fbf54e3c722787b2da76e1f Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:40:51 +0100 Subject: [PATCH 26/37] Update 91-configuration.sh --- ubooquity/rootfs/etc/cont-init.d/91-configuration.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh index e2e6d9534..92c359bac 100644 --- a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh +++ b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh @@ -3,13 +3,18 @@ ########### # 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) + +mkdir -p $FILES $COMICS $BOOKS /config/ubooquity +chown -R abc:abc $FILES $COMICS $BOOKS /config/ubooquity + #FILES='"'$(bashio::config "FilesFolder")'"' #COMICS='"'$(bashio::config "ComicsFolder")'"' #BOOKS='"'$(bashio::config "BooksFolder")'"' -#CURRENTFILES=$(jq ".filesPaths[0].pathString" /config/ubooquity/preferences.json) -#CURRENTCOMICS=$(jq ".comicsPaths[0].pathString" /config/ubooquity/preferences.json) -#CURRENTBOOKS=$(jq ".booksPaths[0].pathString" /config/ubooquity/preferences.json) #sed -i "s|$CURRENTFILES|$FILES|g" /config/ubooquity/preferences.json #sed -i "s|$CURRENTCOMICS|$COMICS|g" /config/ubooquity/preferences.json From a55b2bb62c99ce75df6df62971228e93fe20e52a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 13:47:09 +0100 Subject: [PATCH 27/37] Update Dockerfile --- ubooquity/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index fd000bcea..525014bef 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -7,6 +7,7 @@ COPY rootfs / VOLUME [ "/data" ] VOLUME [ "/share" ] +VOLUME [ "/config" ] # Add bashio RUN apk add --no-cache \ @@ -28,13 +29,15 @@ RUN apk add --no-cache \ && 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 \ # Set config directory + && mkdir -p /config/ubooquity \ + && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/10-adduser \ && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/30-config \ && sed -i 's|/config|/config/ubooquity|g' /etc/services.d/ubooquity/run \ # Set default directory + && mkdir -p /share/ubooquity/files /share/ubooquity/comics /share/ubooquity/books \ && sed -i 's|/files|/share/ubooquity/files|g' /defaults/preferences.json \ && sed -i 's|/comics|/share/ubooquity/comics|g' /defaults/preferences.json \ && sed -i 's|/books|/share/ubooquity/books|g' /defaults/preferences.json \ - && mkdir -p /share/ubooquity/files /share/ubooquity/comics /share/ubooquity/books \ # Allow maximum memory setting && sed -i 's|bash|bashio|g' /etc/services.d/ubooquity/run \ && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/services.d/ubooquity/run From 299a580d1eed2e51ac71fdea489327507be2c1d1 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:02:25 +0100 Subject: [PATCH 28/37] Update Dockerfile --- ubooquity/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 525014bef..98ec729ad 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -34,7 +34,6 @@ RUN apk add --no-cache \ && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/30-config \ && sed -i 's|/config|/config/ubooquity|g' /etc/services.d/ubooquity/run \ # Set default directory - && mkdir -p /share/ubooquity/files /share/ubooquity/comics /share/ubooquity/books \ && sed -i 's|/files|/share/ubooquity/files|g' /defaults/preferences.json \ && sed -i 's|/comics|/share/ubooquity/comics|g' /defaults/preferences.json \ && sed -i 's|/books|/share/ubooquity/books|g' /defaults/preferences.json \ From 2d1a5fe50abd116f1a6772925ad48646a0b6c286 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:02:39 +0100 Subject: [PATCH 29/37] Update Dockerfile --- ubooquity/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 98ec729ad..88379e8f3 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -7,7 +7,6 @@ COPY rootfs / VOLUME [ "/data" ] VOLUME [ "/share" ] -VOLUME [ "/config" ] # Add bashio RUN apk add --no-cache \ @@ -29,7 +28,6 @@ RUN apk add --no-cache \ && 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 \ # Set config directory - && mkdir -p /config/ubooquity \ && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/10-adduser \ && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/30-config \ && sed -i 's|/config|/config/ubooquity|g' /etc/services.d/ubooquity/run \ From 1a4438ec6c75370ac28060bd3d6b3cc1d1053f11 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:04:02 +0100 Subject: [PATCH 30/37] Update Dockerfile --- ubooquity/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 88379e8f3..1af70f0c7 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -23,14 +23,14 @@ RUN apk add --no-cache \ && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ && rm -fr /tmp/bashio.tar.gz \ \ + # Set config directory + && sed -i 's|config|config/ubooquity|g' /etc/cont-init.d/10-adduser \ + && sed -i 's|config|config/ubooquity|g' /etc/cont-init.d/30-config \ + && sed -i 's|config|config/ubooquity|g' /etc/services.d/ubooquity/run \ # 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 \ - # Set config directory - && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/10-adduser \ - && sed -i 's|/config|/config/ubooquity|g' /etc/cont-init.d/30-config \ - && sed -i 's|/config|/config/ubooquity|g' /etc/services.d/ubooquity/run \ # Set default directory && sed -i 's|/files|/share/ubooquity/files|g' /defaults/preferences.json \ && sed -i 's|/comics|/share/ubooquity/comics|g' /defaults/preferences.json \ From 40799dbe6595f9e15ff589568f7bdd1a9ec70d40 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:04:24 +0100 Subject: [PATCH 31/37] Update Dockerfile --- ubooquity/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 1af70f0c7..178064e16 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -5,9 +5,6 @@ FROM ${BUILD_FROM}${BUILD_VERSION} # Copy root filesystem COPY rootfs / -VOLUME [ "/data" ] -VOLUME [ "/share" ] - # Add bashio RUN apk add --no-cache \ curl \ @@ -38,3 +35,5 @@ RUN apk add --no-cache \ # Allow maximum memory setting && sed -i 's|bash|bashio|g' /etc/services.d/ubooquity/run \ && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/services.d/ubooquity/run + +VOLUME [ "/data" ] From d84c7a1cd9d3180bcd5c0c0badc5ef61c844a36d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:05:37 +0100 Subject: [PATCH 32/37] Update 91-configuration.sh --- ubooquity/rootfs/etc/cont-init.d/91-configuration.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh index 92c359bac..6da34649a 100644 --- a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh +++ b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh @@ -3,6 +3,8 @@ ########### # FOLDERS # ########### +mkdir -p $FILES $COMICS $BOOKS /config/ubooquity +chown -R abc:abc $FILES $COMICS $BOOKS /config/ubooquity FILES=$(jq ".filesPaths[0].pathString" /config/ubooquity/preferences.json) COMICS=$(jq ".comicsPaths[0].pathString" /config/ubooquity/preferences.json) From 4537be17a5b8ba4bcc342ec7478fb8c7042c5d7b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:06:43 +0100 Subject: [PATCH 33/37] Update 91-configuration.sh --- .../etc/cont-init.d/91-configuration.sh | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh index 6da34649a..9dc44234e 100644 --- a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh +++ b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh @@ -3,25 +3,9 @@ ########### # FOLDERS # ########### -mkdir -p $FILES $COMICS $BOOKS /config/ubooquity -chown -R abc:abc $FILES $COMICS $BOOKS /config/ubooquity - 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) -mkdir -p $FILES $COMICS $BOOKS /config/ubooquity -chown -R abc:abc $FILES $COMICS $BOOKS /config/ubooquity - -#FILES='"'$(bashio::config "FilesFolder")'"' -#COMICS='"'$(bashio::config "ComicsFolder")'"' -#BOOKS='"'$(bashio::config "BooksFolder")'"' - - -#sed -i "s|$CURRENTFILES|$FILES|g" /config/ubooquity/preferences.json -#sed -i "s|$CURRENTCOMICS|$COMICS|g" /config/ubooquity/preferences.json -#sed -i "s|$CURRENTBOOKS|$BOOKS|g" /config/ubooquity/preferences.json - -#mkdir -p FILES COMICS BOOKS - -#bashio::log.info "Default folders set. Files : $FILES ; Comics : $COMICS ; Books : $BOOKS" +mkdir -p $FILES $COMICS $BOOKS /config/ubooquity || true +chown -R abc:abc $FILES $COMICS $BOOKS /config/ubooquity || true From 0d308679798abdba1c8f54e94e06bf2e8dd402a9 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:32:02 +0100 Subject: [PATCH 34/37] Update 92-mounts --- qbittorrent/rootfs/etc/cont-init.d/92-mounts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/92-mounts b/qbittorrent/rootfs/etc/cont-init.d/92-mounts index 5b3d45ba2..4882b0388 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/92-mounts +++ b/qbittorrent/rootfs/etc/cont-init.d/92-mounts @@ -36,10 +36,10 @@ if bashio::config.has_value 'networkdisks'; then for disk in $MOREDISKS do bashio::log.info "Mount ${disk}" - echo "Creating /storage/storagecifs" - mkdir -p /storage/storagecifs - chown -R abc:abc /storage/storagecifs - mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /storage/storagecifs && \ + echo "Creating /share/storagecifs" + mkdir -p /share/storagecifs + chown -R abc:abc /share/storagecifs + mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /share/storagecifs && \ bashio::log.info "Success!" done || \ bashio::log.warning "Protection mode is ON. Unable to mount external drives!" From c530070f72c1ba96f9597c38b096a23e66e2abe8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:36:09 +0100 Subject: [PATCH 35/37] Update 92-mounts --- qbittorrent/rootfs/etc/cont-init.d/92-mounts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/92-mounts b/qbittorrent/rootfs/etc/cont-init.d/92-mounts index 4882b0388..ba7838dd6 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/92-mounts +++ b/qbittorrent/rootfs/etc/cont-init.d/92-mounts @@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then mkdir -p /share/storagecifs chown -R abc:abc /share/storagecifs mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /share/storagecifs && \ - bashio::log.info "Success!" + bashio::log.info "SMB share was successfully mapped to /share/storagecifs" done || \ bashio::log.warning "Protection mode is ON. Unable to mount external drives!" fi From 82ffd4309fd2bc7c24a0d1a62250a1b2362bc27d Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:37:45 +0100 Subject: [PATCH 36/37] Update 92-mounts --- qbittorrent/rootfs/etc/cont-init.d/92-mounts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qbittorrent/rootfs/etc/cont-init.d/92-mounts b/qbittorrent/rootfs/etc/cont-init.d/92-mounts index ba7838dd6..5fa4bde16 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/92-mounts +++ b/qbittorrent/rootfs/etc/cont-init.d/92-mounts @@ -36,11 +36,11 @@ if bashio::config.has_value 'networkdisks'; then for disk in $MOREDISKS do bashio::log.info "Mount ${disk}" - echo "Creating /share/storagecifs" - mkdir -p /share/storagecifs - chown -R abc:abc /share/storagecifs - mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /share/storagecifs && \ - bashio::log.info "SMB share was successfully mapped to /share/storagecifs" + echo "Creating /mnt/storagecifs" + mkdir -p /mnt/storagecifs + chown -R abc:abc /mnt/storagecifs + mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /mnt/storagecifs && \ + bashio::log.info "SMB share was successfully mapped to /mnt/storagecifs" done || \ bashio::log.warning "Protection mode is ON. Unable to mount external drives!" fi From e063675a76f99000685953aef3b099187cb2bea7 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 16 Feb 2021 14:38:14 +0100 Subject: [PATCH 37/37] Update CHANGELOG.md --- qbittorrent/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index bc9746835..843a3c296 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,7 +1,8 @@ - New configuration option : set download path - New configuration option : set username for webUI - New feature : mount smb share in protected mode -- Removed ability to remove protection and mount local hdd, to increase the addon score +- Changed path :cChanged smb mount path from /storage/externalcifs to /mnt/externalcifs +- Removed feature : ability to remove protection and mount local hdd, to increase the addon score ## 14.3.3.99202101191832-7248-da0b276d5ubuntu20.04.1-ls116 - Update to latest version from linuxserver/docker-qbittorrent