diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index 1ac288686..1f5377fd3 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,7 +1,4 @@ -## 0.24.863-1 (2026-01-16) -- Add ingress support for Jackett. - ## 0.24.863 (2026-01-16) - Update to latest version from linuxserver/docker-jackett (changelog : https://github.com/linuxserver/docker-jackett/releases) diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 9af63ef2e..de4a91d31 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -55,7 +55,7 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh # Manual apps -ENV PACKAGES="curl jq" +ENV PACKAGES="curl" # Automatic apps & bashio ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" diff --git a/jackett/README.md b/jackett/README.md index ba469ce14..4d08f2bb2 100644 --- a/jackett/README.md +++ b/jackett/README.md @@ -29,7 +29,7 @@ _Thanks to everyone having starred my repo! To star it click on the image below, ## About -[Jackett](https://github.com/Jackett/Jackett) works as a proxy server: it translates queries from supported apps into tracker-site-specific HTTP queries, parses the responses, and then sends results back to the requesting software. +[jackett](https://github.com/jackett/jackett) - A fork of jackett to work with movies like Couchpotato. This addon is based on the [docker image](https://github.com/linuxserver/docker-jackett) from linuxserver.io. @@ -47,7 +47,6 @@ Configurations can be done through the app webUI, except for the following optio | `PGID` | int | `0` | Group ID for file permissions | | `PUID` | int | `0` | User ID for file permissions | | `TZ` | str | | Timezone (e.g., `Europe/London`) | -| `connection_mode` | list | `ingress_noauth` | Connection mode (ingress_noauth/noingress_auth/ingress_auth) | | `localdisks` | str | | Local drives to mount (e.g., `sda1,sdb1,MYNAS`) | | `networkdisks` | str | | SMB shares to mount (e.g., `//SERVER/SHARE`) | | `cifsusername` | str | | SMB username for network shares | @@ -60,7 +59,6 @@ Configurations can be done through the app webUI, except for the following optio PGID: 0 PUID: 0 TZ: "Europe/London" -connection_mode: "ingress_noauth" localdisks: "sda1,sdb1" networkdisks: "//192.168.1.100/downloads" cifsusername: "mediauser" @@ -89,3 +87,4 @@ comparison to installing any other Hass.io add-on. [repository]: https://github.com/alexbelgium/hassio-addons + diff --git a/jackett/config.yaml b/jackett/config.yaml index e911d9429..20964ea17 100644 --- a/jackett/config.yaml +++ b/jackett/config.yaml @@ -71,8 +71,6 @@ environment: PGID: "0" PUID: "0" image: ghcr.io/alexbelgium/jackett_nas-{arch} -ingress: true -ingress_entry: jackett init: false map: - config:rw @@ -84,9 +82,6 @@ options: env_vars: [] PGID: 0 PUID: 0 - connection_mode: ingress_noauth -panel_admin: false -panel_icon: mdi:cloud-search-outline ports: 8889/tcp: 8889 9117/tcp: 9117 @@ -106,11 +101,10 @@ schema: cifsdomain: str? cifspassword: str? cifsusername: str? - connection_mode: list(ingress_noauth|noingress_auth|ingress_auth) localdisks: str? networkdisks: str? slug: jackett_nas udev: true url: https://github.com/alexbelgium/hassio-addons/tree/master/jackett -version: "0.24.863-1" +version: "0.24.863" webui: http://[HOST]:[PORT:9117] diff --git a/jackett/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/jackett/rootfs/etc/cont-init.d/32-nginx_ingress.sh deleted file mode 100755 index d88c560b7..000000000 --- a/jackett/rootfs/etc/cont-init.d/32-nginx_ingress.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e - -################# -# NGINX SETTING # -################# -declare ingress_interface -declare ingress_port -declare ingress_entry - -ingress_port=$(bashio::addon.ingress_port) -ingress_interface=$(bashio::addon.ip_address) -ingress_entry=$(bashio::addon.ingress_entry) -sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf -sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf -sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf - -################## -# CONFIG SETTING # -################## - -# Values -slug=jackett -CONFIG_LOCATION="/config/addons_config/Jackett/ServerConfig.json" - -if [ -f "$CONFIG_LOCATION" ]; then - connection_mode="$(bashio::config "connection_mode")" - bashio::log.green "---------------------------" - bashio::log.green "Connection_mode is $connection_mode" - bashio::log.green "---------------------------" - case "$connection_mode" in - ingress_noauth|ingress_auth) - base_path="$slug" - ;; - noingress_auth) - base_path="" - ;; - esac - - if command -v jq >/dev/null 2>&1; then - tmp_config="$(mktemp)" - jq --arg basepath "$base_path" '.BasePathOverride = $basepath' "$CONFIG_LOCATION" > "$tmp_config" - mv "$tmp_config" "$CONFIG_LOCATION" - else - bashio::log.warning "jq not available; skipping BasePathOverride update" - fi -fi diff --git a/jackett/rootfs/etc/nginx/includes/mime.types b/jackett/rootfs/etc/nginx/includes/mime.types deleted file mode 100644 index 7c7cdef2d..000000000 --- a/jackett/rootfs/etc/nginx/includes/mime.types +++ /dev/null @@ -1,96 +0,0 @@ -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/jackett/rootfs/etc/nginx/includes/proxy_params.conf b/jackett/rootfs/etc/nginx/includes/proxy_params.conf deleted file mode 100644 index e3cd0748e..000000000 --- a/jackett/rootfs/etc/nginx/includes/proxy_params.conf +++ /dev/null @@ -1,16 +0,0 @@ -proxy_http_version 1.1; -proxy_ignore_client_abort off; -proxy_read_timeout 86400s; -proxy_redirect off; -proxy_send_timeout 86400s; -proxy_max_temp_file_size 0; - -proxy_hide_header X-Frame-Options; -proxy_set_header Accept-Encoding ""; -#proxy_set_header Connection $http_connection; -#proxy_set_header Upgrade $http_upgrade; -proxy_set_header Host $http_host; -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -proxy_set_header X-Forwarded-Proto $scheme; -proxy_set_header X-NginX-Proxy true; -proxy_set_header X-Real-IP $remote_addr; diff --git a/jackett/rootfs/etc/nginx/includes/resolver.conf b/jackett/rootfs/etc/nginx/includes/resolver.conf deleted file mode 100644 index 70f4982b9..000000000 --- a/jackett/rootfs/etc/nginx/includes/resolver.conf +++ /dev/null @@ -1 +0,0 @@ -resolver 127.0.0.11 ipv6=off; diff --git a/jackett/rootfs/etc/nginx/includes/server_params.conf b/jackett/rootfs/etc/nginx/includes/server_params.conf deleted file mode 100644 index c5d9db8ec..000000000 --- a/jackett/rootfs/etc/nginx/includes/server_params.conf +++ /dev/null @@ -1,6 +0,0 @@ -root /app/Jackett; -server_name $hostname; - -add_header X-Content-Type-Options nosniff; -add_header X-XSS-Protection "1; mode=block"; -add_header X-Robots-Tag none; diff --git a/jackett/rootfs/etc/nginx/includes/ssl_params.conf b/jackett/rootfs/etc/nginx/includes/ssl_params.conf deleted file mode 100644 index 6f1500599..000000000 --- a/jackett/rootfs/etc/nginx/includes/ssl_params.conf +++ /dev/null @@ -1,9 +0,0 @@ -ssl_protocols TLSv1.2; -ssl_prefer_server_ciphers on; -ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; -ssl_ecdh_curve secp384r1; -ssl_session_timeout 10m; -ssl_session_cache shared:SSL:10m; -ssl_session_tickets off; -ssl_stapling on; -ssl_stapling_verify on; diff --git a/jackett/rootfs/etc/nginx/includes/upstream.conf b/jackett/rootfs/etc/nginx/includes/upstream.conf deleted file mode 100644 index 61ecbf251..000000000 --- a/jackett/rootfs/etc/nginx/includes/upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream backend { - server 127.0.0.1:8080; -} diff --git a/jackett/rootfs/etc/nginx/nginx.conf b/jackett/rootfs/etc/nginx/nginx.conf deleted file mode 100644 index 833c2ad1d..000000000 --- a/jackett/rootfs/etc/nginx/nginx.conf +++ /dev/null @@ -1,57 +0,0 @@ - -# Run nginx in foreground. -daemon off; - -# This is run inside Docker. -user root; - -# Pid storage location. -pid /var/run/nginx.pid; - -# Set number of worker processes. -worker_processes 1; - -# Enables the use of JIT for regular expressions to speed-up their processing. -pcre_jit on; - -# Write error log to Hass.io add-on log. -error_log /proc/1/fd/1 error; - -# Load allowed environment vars -env HASSIO_TOKEN; - -# Load dynamic modules. -include /etc/nginx/modules/*.conf; - -# Max num of simultaneous connections by a worker process. -events { - worker_connections 512; -} - -http { - include /etc/nginx/includes/mime.types; - - log_format hassio '[$time_local] $status ' - '$http_x_forwarded_for($remote_addr) ' - '$request ($http_user_agent)'; - - access_log /proc/1/fd/1 hassio; - client_max_body_size 4G; - default_type application/octet-stream; - gzip on; - keepalive_timeout 65; - sendfile on; - server_tokens off; - tcp_nodelay on; - tcp_nopush on; - - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } - - include /etc/nginx/includes/resolver.conf; - include /etc/nginx/includes/upstream.conf; - - include /etc/nginx/servers/*.conf; -} diff --git a/jackett/rootfs/etc/nginx/servers/ingress.conf b/jackett/rootfs/etc/nginx/servers/ingress.conf deleted file mode 100644 index c61087c5a..000000000 --- a/jackett/rootfs/etc/nginx/servers/ingress.conf +++ /dev/null @@ -1,29 +0,0 @@ -server { - listen %%interface%%:%%port%% default_server; - - #include /etc/nginx/includes/server_params.conf; - #include /etc/nginx/includes/proxy_params.conf; - - client_max_body_size 0; - - location / { - add_header Access-Control-Allow-Origin *; - proxy_connect_timeout 30m; - proxy_send_timeout 30m; - proxy_read_timeout 30m; - proxy_pass http://127.0.0.1:9117; - - # Allow signalr - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $http_connection; - #auth_basic off; - - # Correct base_url - proxy_set_header Accept-Encoding ""; - sub_filter_once off; - sub_filter_types *; - sub_filter /jackett %%ingress_entry%%/jackett; - } - -} diff --git a/jackett/rootfs/etc/services.d/nginx/finish b/jackett/rootfs/etc/services.d/nginx/finish deleted file mode 100644 index 444240135..000000000 --- a/jackett/rootfs/etc/services.d/nginx/finish +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/execlineb -S0 -# ============================================================================== -# Take down the S6 supervision tree when Nginx fails -# ============================================================================== -if { s6-test ${1} -ne 0 } -if { s6-test ${1} -ne 256 } - -s6-svscanctl -t /var/run/s6/services diff --git a/jackett/rootfs/etc/services.d/nginx/run b/jackett/rootfs/etc/services.d/nginx/run deleted file mode 100755 index b8418f169..000000000 --- a/jackett/rootfs/etc/services.d/nginx/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e -# ============================================================================== - -# Wait for Jackett to become available -bashio::net.wait_for 9117 localhost 900 - -bashio::log.info "Starting NGinx..." -exec nginx