From 3fe3e23e0777f12f2ca991ba4dc22f74f6bcfce7 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 4 Feb 2023 12:32:32 +0100 Subject: [PATCH] Add ingress --- radarr/rootfs/etc/services.d/nginx/run | 6 ++ readarr/CHANGELOG.md | 71 ++++++++++++++ readarr/config.json | 10 +- .../etc/cont-init.d/00-config_location.sh | 6 ++ readarr/rootfs/etc/cont-init.d/20-folders.sh | 6 +- .../etc/cont-init.d/32-nginx_ingress.sh | 15 +++ readarr/rootfs/etc/nginx/includes/mime.types | 96 +++++++++++++++++++ .../etc/nginx/includes/proxy_params.conf | 16 ++++ .../rootfs/etc/nginx/includes/resolver.conf | 1 + .../etc/nginx/includes/server_params.conf | 6 ++ .../rootfs/etc/nginx/includes/ssl_params.conf | 9 ++ .../rootfs/etc/nginx/includes/upstream.conf | 3 + readarr/rootfs/etc/nginx/nginx.conf | 57 +++++++++++ readarr/rootfs/etc/nginx/servers/ingress.conf | 23 +++++ readarr/rootfs/etc/services.d/nginx/finish | 8 ++ readarr/rootfs/etc/services.d/nginx/run | 32 +++++++ sonarr/rootfs/etc/services.d/nginx/run | 6 ++ 17 files changed, 364 insertions(+), 7 deletions(-) create mode 100644 readarr/rootfs/etc/cont-init.d/32-nginx_ingress.sh create mode 100644 readarr/rootfs/etc/nginx/includes/mime.types create mode 100644 readarr/rootfs/etc/nginx/includes/proxy_params.conf create mode 100644 readarr/rootfs/etc/nginx/includes/resolver.conf create mode 100644 readarr/rootfs/etc/nginx/includes/server_params.conf create mode 100644 readarr/rootfs/etc/nginx/includes/ssl_params.conf create mode 100644 readarr/rootfs/etc/nginx/includes/upstream.conf create mode 100644 readarr/rootfs/etc/nginx/nginx.conf create mode 100644 readarr/rootfs/etc/nginx/servers/ingress.conf create mode 100644 readarr/rootfs/etc/services.d/nginx/finish create mode 100644 readarr/rootfs/etc/services.d/nginx/run diff --git a/radarr/rootfs/etc/services.d/nginx/run b/radarr/rootfs/etc/services.d/nginx/run index 0f51510b1..d085e3a4b 100644 --- a/radarr/rootfs/etc/services.d/nginx/run +++ b/radarr/rootfs/etc/services.d/nginx/run @@ -7,6 +7,12 @@ bashio::net.wait_for 7878 localhost 900 # Set base url CONFIG_LOCATION=/config/addons_config/radarr/config.xml +if bashio::config.has_value 'CONFIG_LOCATION'; then + CONFIG_LOCATION="$(bashio::config 'CONFIG_LOCATION')" + # Modify if it is a base directory + if [ -f "$CONFIG_LOCATION" ]; then CONFIG_LOCATION="$(dirname $CONFIG_LOCATION)"; fi +fi + while ! [ -f "$CONFIG_LOCATION" ]; do echo "Waiting for $CONFIG_LOCATION to be created" diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md index fda5eb0ad..e0efeba51 100644 --- a/readarr/CHANGELOG.md +++ b/readarr/CHANGELOG.md @@ -1,210 +1,281 @@ +- Ingress addition +- Base url set to "readarr" ## nightly-0.1.2.1558-ls159 (04-02-2023) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.2.1544-ls158 (28-01-2023) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.2.1533-ls155 (22-01-2023) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1527-ls153 (21-01-2023) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1526-ls151 (14-01-2023) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1504-ls149 (31-12-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1504-ls148 (25-12-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1504-ls146 (01-12-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1494-ls145 (27-11-2022) + - Update to latest version from linuxserver/docker-readarr - WARNING : update to supervisor 2022.11 before installing ## nightly-0.1.1.1459-ls144 (19-11-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1459-ls143 (11-11-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1459-ls142 (05-11-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1426-ls139 (01-11-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1426-ls138 (29-10-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1426-ls137 (27-09-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1409-ls136 (24-09-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1409-ls135 (01-09-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1409-ls134 (26-08-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1409-ls133 (16-08-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1402-ls131 (11-08-2022) + - Update to latest version from linuxserver/docker-readarr - Config changed to /config/addons_config/readarr ## nightly-0.1.1.1402-ls130 (06-08-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1394-ls128 (28-07-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1383-ls127 (23-07-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1383-ls126 (19-07-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1377-ls125 (09-07-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1377-ls124 (23-06-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1374-ls123 (18-06-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1372-ls122 (16-06-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1352-ls121 (31-05-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1337-ls119 (26-05-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1323-ls117 (17-05-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1320-ls116 (12-05-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1320-ls115 (11-05-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1318-ls114 (10-05-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1314-ls113 (05-05-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1314-ls112 (28-04-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1314-ls111 (26-04-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1312-ls110 (19-04-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1306-ls109 (14-04-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1306-ls108 (09-04-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1302-ls107 (07-04-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1297-ls106 (05-04-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1287-ls105 (02-04-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1287-ls104 (24-03-2022) + - Update to latest version from linuxserver/docker-readarr - Add codenotary sign ## nightly-0.1.1.1281-ls103 (17-03-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1281-ls102 (17-03-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1278-ls101 (10-03-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1273-ls99 (08-03-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1273-ls98 (08-03-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1268-ls97 (06-03-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1259-ls96 (22-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.1.1251-ls95 (22-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-0.1.0.1248-ls94 (21-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1245-ls34 (17-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1244-ls33 (17-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1242-ls31 (12-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1240-ls30 (10-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1232-ls29 (07-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1232-ls28 (05-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1225-ls27 (04-02-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1225-ls26 (27-01-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1222-ls24 (25-01-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1218-ls22 (24-01-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1211-ls21 (23-01-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1209-ls20 (21-01-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1208-ls19 (21-01-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1190-ls17 (20-01-2022) + - Update to latest version from linuxserver/docker-readarr ## nightly-alpine-0.1.0.1189-ls16 (20-01-2022) + - Update to latest version from linuxserver/docker-readarr + ## nightly-alpine-0.1.0.1181-ls14 (19-01-2022) - Update to latest version from linuxserver/docker-readarr diff --git a/readarr/config.json b/readarr/config.json index 30b70b9e6..c8f09f8a4 100644 --- a/readarr/config.json +++ b/readarr/config.json @@ -47,17 +47,20 @@ }, "image": "ghcr.io/alexbelgium/readarr_nas-{arch}", "init": false, + "ingress": true, + "ingress_entry": "readarr", "map": [ "config:rw", "share:rw", "media:rw" ], - "name": "Readarr NAS", + "name": "Readarr", "options": { "CONFIG_LOCATION": "/config/addons_config/readarr", "PGID": 0, "PUID": 0 }, + "panel_icon": "mdi:download-circle", "ports": { "8787/tcp": 8787 }, @@ -80,6 +83,5 @@ }, "slug": "readarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr", - "version": "nightly-0.1.2.1558-ls159", - "webui": "[PROTO:ssl]://[HOST]:[PORT:8787]" -} + "version": "nightly-0.1.2.1558-ls159-2" +} \ No newline at end of file diff --git a/readarr/rootfs/etc/cont-init.d/00-config_location.sh b/readarr/rootfs/etc/cont-init.d/00-config_location.sh index 1bacfdd8f..1de2d4ab3 100755 --- a/readarr/rootfs/etc/cont-init.d/00-config_location.sh +++ b/readarr/rootfs/etc/cont-init.d/00-config_location.sh @@ -1,6 +1,12 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash +if bashio::config.has_value 'CONFIG_LOCATION'; then + CONFIG_LOCATION="$(bashio::config 'CONFIG_LOCATION')" + # Modify if it is a base directory + if [ -f "$CONFIG_LOCATION" ]; then CONFIG_LOCATION="$(dirname $CONFIG_LOCATION)"; fi +fi + CONFIG_LOCATION=$(bashio::config 'CONFIG_LOCATION') bashio::log.info "Config stored in $CONFIG_LOCATION" diff --git a/readarr/rootfs/etc/cont-init.d/20-folders.sh b/readarr/rootfs/etc/cont-init.d/20-folders.sh index c51399c0d..971c49606 100755 --- a/readarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/readarr/rootfs/etc/cont-init.d/20-folders.sh @@ -26,7 +26,7 @@ if [ ! -d /config/addons_config/readarr ]; then chown -R abc:abc /config/addons_config/readarr fi -if [ -d /config/addons_config/radarr/readarr ]; then - mv /config/addons_config/radarr/readarr/{.,}* /config/addons_config/readarr/ - rmdir /config/addons_config/radarr/readarr +if [ -d /config/addons_config/readarr/readarr ]; then + mv /config/addons_config/readarr/readarr/{.,}* /config/addons_config/readarr/ + rmdir /config/addons_config/readarr/readarr fi diff --git a/readarr/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/readarr/rootfs/etc/cont-init.d/32-nginx_ingress.sh new file mode 100644 index 000000000..f307cd7af --- /dev/null +++ b/readarr/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/readarr/rootfs/etc/nginx/includes/mime.types b/readarr/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/readarr/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/readarr/rootfs/etc/nginx/includes/proxy_params.conf b/readarr/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..924ba949e --- /dev/null +++ b/readarr/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/readarr/rootfs/etc/nginx/includes/resolver.conf b/readarr/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..6485af141 --- /dev/null +++ b/readarr/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/readarr/rootfs/etc/nginx/includes/server_params.conf b/readarr/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..8f104df59 --- /dev/null +++ b/readarr/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /app/readarr/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/readarr/rootfs/etc/nginx/includes/ssl_params.conf b/readarr/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/readarr/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/readarr/rootfs/etc/nginx/includes/upstream.conf b/readarr/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..61ecbf251 --- /dev/null +++ b/readarr/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:8080; +} diff --git a/readarr/rootfs/etc/nginx/nginx.conf b/readarr/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..833c2ad1d --- /dev/null +++ b/readarr/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/readarr/rootfs/etc/nginx/servers/ingress.conf b/readarr/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..cd50054dd --- /dev/null +++ b/readarr/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:8787; + + proxy_set_header Accept-Encoding ""; + # Correct url without port when using https + sub_filter_once off; + sub_filter_types *; + sub_filter /readarr %%ingress_entry%%/readarr; + } + +} diff --git a/readarr/rootfs/etc/services.d/nginx/finish b/readarr/rootfs/etc/services.d/nginx/finish new file mode 100644 index 000000000..444240135 --- /dev/null +++ b/readarr/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/readarr/rootfs/etc/services.d/nginx/run b/readarr/rootfs/etc/services.d/nginx/run new file mode 100644 index 000000000..566409336 --- /dev/null +++ b/readarr/rootfs/etc/services.d/nginx/run @@ -0,0 +1,32 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +# ============================================================================== + +# Wait for transmission to become available +bashio::net.wait_for 8787 localhost 900 + +# Set base url + +CONFIG_LOCATION=/config/addons_config/readarr/config.xml + +if bashio::config.has_value 'CONFIG_LOCATION'; then + CONFIG_LOCATION="$(bashio::config 'CONFIG_LOCATION')" + # Modify if it is a base directory + if [ -f "$CONFIG_LOCATION" ]; then CONFIG_LOCATION="$(dirname $CONFIG_LOCATION)"; fi +fi + +while ! [ -f "$CONFIG_LOCATION" ]; +do + echo "Waiting for $CONFIG_LOCATION to be created" + sleep 1 +done + +if ! grep -q "/readarr" "$CONFIG_LOCATION"; then + bashio::log.warning "BaseUrl not set properly, restarting" + sed -i "/UrlBase/d" "$CONFIG_LOCATION" + sed -i "//a \/readarr<\/UrlBase>" "$CONFIG_LOCATION" + bashio::addon.restart +fi + +bashio::log.info "Starting NGinx..." +exec nginx diff --git a/sonarr/rootfs/etc/services.d/nginx/run b/sonarr/rootfs/etc/services.d/nginx/run index 4cd33b3ab..b8310175d 100644 --- a/sonarr/rootfs/etc/services.d/nginx/run +++ b/sonarr/rootfs/etc/services.d/nginx/run @@ -7,6 +7,12 @@ bashio::net.wait_for 8989 localhost 900 # Set base url CONFIG_LOCATION=/config/addons_config/sonarr/config.xml +if bashio::config.has_value 'CONFIG_LOCATION'; then + CONFIG_LOCATION="$(bashio::config 'CONFIG_LOCATION')" + # Modify if it is a base directory + if [ -f "$CONFIG_LOCATION" ]; then CONFIG_LOCATION="$(dirname $CONFIG_LOCATION)"; fi +fi + while ! [ -f "$CONFIG_LOCATION" ]; do echo "Waiting for $CONFIG_LOCATION to be created"