diff --git a/radarr/CHANGELOG.md b/radarr/CHANGELOG.md index e7f7b4911..7ea26e16b 100644 --- a/radarr/CHANGELOG.md +++ b/radarr/CHANGELOG.md @@ -1,10 +1,14 @@ +- Ingress addition ## 4.3.2.6857 (07-01-2023) + - Update to latest version from linuxserver/docker-radarr - WARNING : update to supervisor 2022.11 before installing ## 4.2.4.6635 (27-09-2022) + - Update to latest version from linuxserver/docker-radarr + ## 4.1.0.6175 (16-04-2022) - Update to latest version from linuxserver/docker-radarr diff --git a/radarr/config.json b/radarr/config.json index 2120a0544..631828484 100644 --- a/radarr/config.json +++ b/radarr/config.json @@ -47,17 +47,20 @@ }, "image": "ghcr.io/alexbelgium/radarr_nas-{arch}", "init": false, + "ingress": true, + "ingress_entry": "radarr", "map": [ "config:rw", "share:rw", "media:rw", "ssl" ], - "name": "Radarr NAS", + "name": "Radarr", "options": { "PGID": 0, "PUID": 0 }, + "panel_icon": "mdi:download-circle", "ports": { "7878/tcp": 7878 }, @@ -80,6 +83,6 @@ }, "slug": "radarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr", - "version": "4.3.2.6857-3", + "version": "4.3.2.6857-4", "webui": "[PROTO:ssl]://[HOST]:[PORT:7878]" } \ No newline at end of file diff --git a/radarr/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/radarr/rootfs/etc/cont-init.d/32-nginx_ingress.sh new file mode 100644 index 000000000..f307cd7af --- /dev/null +++ b/radarr/rootfs/etc/cont-init.d/32-nginx_ingress.sh @@ -0,0 +1,15 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +################# +# NGINX SETTING # +################# +declare ingress_interface +declare ingress_port + +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 diff --git a/radarr/rootfs/etc/nginx/includes/mime.types b/radarr/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/radarr/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +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/radarr/rootfs/etc/nginx/includes/proxy_params.conf b/radarr/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..924ba949e --- /dev/null +++ b/radarr/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,16 @@ +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 $connection_upgrade; +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/radarr/rootfs/etc/nginx/includes/resolver.conf b/radarr/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..6485af141 --- /dev/null +++ b/radarr/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/radarr/rootfs/etc/nginx/includes/server_params.conf b/radarr/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..9f7f24759 --- /dev/null +++ b/radarr/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /app/radarr/bin/UI; +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/radarr/rootfs/etc/nginx/includes/ssl_params.conf b/radarr/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/radarr/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +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/radarr/rootfs/etc/nginx/includes/upstream.conf b/radarr/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..61ecbf251 --- /dev/null +++ b/radarr/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:8080; +} diff --git a/radarr/rootfs/etc/nginx/nginx.conf b/radarr/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..833c2ad1d --- /dev/null +++ b/radarr/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,57 @@ + +# 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/radarr/rootfs/etc/nginx/servers/ingress.conf b/radarr/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..53900f0c2 --- /dev/null +++ b/radarr/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,23 @@ +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:7878; + + proxy_set_header Accept-Encoding ""; + # Correct url without port when using https + sub_filter_once off; + sub_filter_types *; + sub_filter /radarr %%ingress_entry%%/radarr; + } + +} diff --git a/radarr/rootfs/etc/services.d/nginx/finish b/radarr/rootfs/etc/services.d/nginx/finish new file mode 100644 index 000000000..444240135 --- /dev/null +++ b/radarr/rootfs/etc/services.d/nginx/finish @@ -0,0 +1,8 @@ +#!/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/radarr/rootfs/etc/services.d/nginx/run b/radarr/rootfs/etc/services.d/nginx/run new file mode 100644 index 000000000..dcbefb5d3 --- /dev/null +++ b/radarr/rootfs/etc/services.d/nginx/run @@ -0,0 +1,14 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +# ============================================================================== + +# Wait for transmission to become available +bashio::net.wait_for 8989 localhost 900 + +# Set base url +CONFIG_LOCATION=/config/addons_config/radarr/config.xml +sed -i "/UrlBase/d" "$CONFIG_LOCATION" +sed -i "//a \/radarr<\/UrlBase>" "$CONFIG_LOCATION" + +bashio::log.info "Starting NGinx..." +exec nginx diff --git a/sonarr/config.json b/sonarr/config.json index ca9ee2c4f..e6f694681 100644 --- a/sonarr/config.json +++ b/sonarr/config.json @@ -55,11 +55,12 @@ "media:rw", "ssl" ], - "name": "Sonarr NAS", + "name": "Sonarr", "options": { "PGID": 0, "PUID": 0 }, + "panel_icon": "mdi:download-circle-outline", "ports": { "8989/tcp": 8989 }, @@ -83,4 +84,4 @@ "slug": "sonarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/sonarr", "version": "3.0.9.1549-2" -} +} \ No newline at end of file