Merge branch 'master' of https://github.com/alexbelgium/hassio-addons

2026-03-14 08:54:22 +01:00 · 2022-09-23 17:33:05 +02:00
parent 3a3566cea7 bb2656da72
commit b6dc340c2e
23 changed files with 62 additions and 31 deletions
--- a/calibre/CHANGELOG.md
+++ b/calibre/CHANGELOG.md
@@ -1,4 +1,7 @@

+## v6.5.0-ls182 (22-09-2022)
+- Update to latest version from linuxserver/docker-calibre
+
 ## v6.5.0-ls181 (20-09-2022)
 - Update to latest version from linuxserver/docker-calibre

--- a/calibre/config.json
+++ b/calibre/config.json
@@ -89,6 +89,6 @@
  },
  "slug": "calibre",
  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre",
-  "version": "v6.5.0-ls181",
+  "version": "v6.5.0-ls182",
  "video": true
-}
+}
--- a/calibre/updater.json
+++ b/calibre/updater.json
@@ -1,10 +1,10 @@
 {
  "github_fulltag": "true",
-  "last_update": "20-09-2022",
+  "last_update": "22-09-2022",
  "paused": false,
  "repository": "alexbelgium/hassio-addons",
  "slug": "calibre",
  "source": "github",
  "upstream_repo": "linuxserver/docker-calibre",
-  "upstream_version": "v6.5.0-ls181"
+  "upstream_version": "v6.5.0-ls182"
 }
--- a/calibre_web/CHANGELOG.md
+++ b/calibre_web/CHANGELOG.md
@@ -1,4 +1,7 @@

+## 0.6.19-ls175 (22-09-2022)
+- Update to latest version from linuxserver/docker-calibre-web
+
 ## 0.6.19-ls174 (15-09-2022)
 - Update to latest version from linuxserver/docker-calibre-web

--- a/calibre_web/config.json
+++ b/calibre_web/config.json
@@ -90,6 +90,6 @@
  },
  "slug": "calibre-web",
  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre-web",
-  "version": "0.6.19-ls174",
+  "version": "0.6.19-ls175",
  "video": true
-}
+}
--- a/calibre_web/updater.json
+++ b/calibre_web/updater.json
@@ -1,10 +1,10 @@
 {
  "github_fulltag": "true",
-  "last_update": "15-09-2022",
+  "last_update": "22-09-2022",
  "paused": false,
  "repository": "alexbelgium/hassio-addons",
  "slug": "calibre-web",
  "source": "github",
  "upstream_repo": "linuxserver/docker-calibre-web",
-  "upstream_version": "0.6.19-ls174"
+  "upstream_version": "0.6.19-ls175"
 }
--- a/jackett/CHANGELOG.md
+++ b/jackett/CHANGELOG.md
@@ -1,4 +1,7 @@

+## 0.20.1916 (22-09-2022)
+- Update to latest version from linuxserver/docker-jackett
+
 ## 0.20.1913 (20-09-2022)
 - Update to latest version from linuxserver/docker-jackett

--- a/jackett/config.json
+++ b/jackett/config.json
@@ -43,6 +43,6 @@
  },
  "slug": "jackett_nas",
  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett",
-  "version": "0.20.1913",
+  "version": "0.20.1916",
  "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]"
-}
+}
--- a/jackett/updater.json
+++ b/jackett/updater.json
@@ -1,8 +1,8 @@
 {
-  "last_update": "20-09-2022",
+  "last_update": "22-09-2022",
  "repository": "alexbelgium/hassio-addons",
  "slug": "jackett",
  "source": "github",
  "upstream_repo": "linuxserver/docker-jackett",
-  "upstream_version": "0.20.1913"
+  "upstream_version": "0.20.1916"
 }
--- a/overseerr/rootfs/etc/cont-init.d/00-config_location.sh
+++ b/overseerr/rootfs/etc/cont-init.d/00-config_location.sh
@@ -8,6 +8,7 @@ mkdir -p "$CONFIG_LOCATION"
 chown -R abc:abc "$CONFIG_LOCATION"
 chmod -R 755 "$CONFIG_LOCATION"

+# shellcheck disable=SC2013
 for file in $(grep -Esril "/config/addons_config/overseerr" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do
    sed -i "s=/config/addons_config/overseerr=$CONFIG_LOCATION=g" "$file"
 done
--- a/overseerr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/overseerr/rootfs/etc/cont-init.d/20-folders.sh
@@ -10,6 +10,7 @@ if [ -d /config/addons_config/addons_config/overseerr ]; then
    mv /config/addons_config/addons_config/overseerr /config/addons_config/overseerr
 fi

+# shellcheck disable=SC2013
 for file in $(grep -Esril "/config/.config/yarn" /usr /etc /defaults); do
    sed -i "s=/config/.config/yarn=/config/addons_config/overseerr/yarn=g" "$file"
 done
--- a/plex/CHANGELOG.md
+++ b/plex/CHANGELOG.md
@@ -1,4 +1,7 @@

+## 1.28.2.6151-914ddd2b3-ls132 (22-09-2022)
+- Update to latest version from linuxserver/docker-plex
+
 ## 1.28.2.6151-914ddd2b3-ls131 (09-09-2022)
 - Update to latest version from linuxserver/docker-plex

--- a/plex/config.json
+++ b/plex/config.json
@@ -115,7 +115,7 @@
  },
  "slug": "plex_nas",
  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex",
-  "version": "1.28.2.6151-914ddd2b3-ls131-2-bugfix",
+  "version": "1.28.2.6151-914ddd2b3-ls132",
  "video": true,
  "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web"
-}
+}
--- a/plex/updater.json
+++ b/plex/updater.json
@@ -1,9 +1,9 @@
 {
  "github_fulltag": "true",
-  "last_update": "09-09-2022",
+  "last_update": "22-09-2022",
  "repository": "alexbelgium/hassio-addons",
  "slug": "plex",
  "source": "github",
  "upstream_repo": "linuxserver/docker-plex",
-  "upstream_version": "1.28.2.6151-914ddd2b3-ls131"
+  "upstream_version": "1.28.2.6151-914ddd2b3-ls132"
 }
--- a/qbittorrent/CHANGELOG.md
+++ b/qbittorrent/CHANGELOG.md
@@ -1,4 +1,7 @@

+## 4.4.5-r0-ls217 (22-09-2022)
+- Update to latest version from linuxserver/docker-qbittorrent
+
 ## 4.4.5-r0-ls216 (20-09-2022)
 - Update to latest version from linuxserver/docker-qbittorrent

--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -16,7 +16,7 @@

 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="4.4.5-r0-ls216"
+ARG BUILD_UPSTREAM="4.4.5-r0-ls217"
 FROM ${BUILD_FROM}-$BUILD_UPSTREAM

 ##################
--- a/qbittorrent/config.json
+++ b/qbittorrent/config.json
@@ -115,5 +115,5 @@
  },
  "slug": "qbittorrent",
  "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "4.4.5-r0-ls216"
-}
+  "version": "4.4.5-r0-ls217"
+}
--- a/qbittorrent/updater.json
+++ b/qbittorrent/updater.json
@@ -1,9 +1,9 @@
 {
  "github_fulltag": "true",
-  "last_update": "20-09-2022",
+  "last_update": "22-09-2022",
  "repository": "alexbelgium/hassio-addons",
  "slug": "qbittorrent",
  "source": "github",
  "upstream_repo": "linuxserver/docker-qbittorrent",
-  "upstream_version": "4.4.5-r0-ls216"
+  "upstream_version": "4.4.5-r0-ls217"
 }
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -37,7 +37,8 @@ RUN \
    # Adapt sync.conf
    && sed -i 's|"directory_root_policy" : "belowroot"|"directory_root_policy" : "all"|g' /defaults/sync.conf \
    && sed -i 's|"allow_empty_password" : false|"allow_empty_password" : true|g' /defaults/sync.conf \
-    && sed -i 's|"dir_whitelist" : [ "|"dir_whitelist" : [ "/" "|g' /defaults/sync.conf
+    \
+    && sed -i 's|"/sync",|"/", "/sync",|g' /defaults/sync.conf

 # Global LSIO modifications
 ARG CONFIGLOCATION="/share/resiliosync_config"
--- a/tandoor_recipes/CHANGELOG.md
+++ b/tandoor_recipes/CHANGELOG.md
@@ -1,3 +1,6 @@
+
+## 1.4.1 (22-09-2022)
+- Update to latest version from TandoorRecipes/recipes
 - Allow nabucasa url
 - Ingress addition

--- a/tandoor_recipes/config.json
+++ b/tandoor_recipes/config.json
@@ -8,7 +8,7 @@
  "description": "recipe manager",
  "environment": {
    "DB_ENGINE": "django.db.backends.sqlite3",
-    "DEBUG": "1",
+    "DEBUG": "0",
    "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db",
    "TRUSTED_PROXIES": "**"
  },
@@ -45,5 +45,5 @@
  ],
  "slug": "tandoor_recipes",
  "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.3.3-ingress2"
-}
+  "version": "1.4.1-2"
+}
--- a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf
+++ b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf
@@ -6,6 +6,16 @@ server {

    root /opt/recipes/cookbook;

+    location /switch-space {
+        proxy_pass http://127.0.0.1:8080/switch-space;
+        proxy_set_header Host $http_host;
+        proxy_buffering off;
+        proxy_read_timeout 30;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Upgrade $http_upgrade;
+        
+    }
+
    location / {
       proxy_pass http://127.0.0.1:8080;
       proxy_buffering off;
@@ -19,7 +29,7 @@ server {

       # Allow frames
       proxy_hide_header "Content-Security-Policy";
-       add_header X-Frame-Options SAMEORIGIN;
+       add_header X-Frame-Options SAMEORIGIN;           # Required for ingress frame
       add_header Access-Control-Allow-Origin *;
       proxy_set_header Accept-Encoding "";
       
@@ -41,7 +51,7 @@ server {
        proxy_set_header X-Port            $x_port;
        proxy_set_header X-Forwarded-Proto $x_scheme;

-        proxy_set_header Host $host$x_port;                   # try $host instead if this doesn't work 
+        proxy_set_header Host $host$x_port;              # Required for addresses without ports 

        # Correct url without port when using https
        sub_filter_once off;
@@ -50,7 +60,7 @@ server {
        sub_filter          http://$x_host/           http://$x_host$x_port/;

       # Rewrite url
-       sub_filter "/static" "%%ingress_entry%%/static";
-       sub_filter "/media" "%%ingress_entry%%/media";
+       sub_filter "/static/" "%%ingress_entry%%/static/";
+       sub_filter "/media/" "%%ingress_entry%%/media/";
    }
 }
--- a/tandoor_recipes/updater.json
+++ b/tandoor_recipes/updater.json
@@ -1,8 +1,8 @@
 {
-  "last_update": "04-08-2022",
+  "last_update": "22-09-2022",
  "repository": "alexbelgium/hassio-addons",
  "slug": "tandoor_recipes",
  "source": "github",
  "upstream_repo": "TandoorRecipes/recipes",
-  "upstream_version": "1.3.3"
+  "upstream_version": "1.4.1"
 }