From 6a51a6aff3478dd6153af0cafd28b9d4033111a7 Mon Sep 17 00:00:00 2001 From: HalianElf <28244771+HalianElf@users.noreply.github.com> Date: Fri, 14 Feb 2020 12:22:13 -0500 Subject: [PATCH 1/6] Update RPC endpoints Allows credentials to be passed through the URL for apps like LunaSea --- nzbget.subfolder.conf.sample | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample index 0e19921..1238a88 100644 --- a/nzbget.subfolder.conf.sample +++ b/nzbget.subfolder.conf.sample @@ -1,6 +1,6 @@ # nzbget does not require a base url setting -location ^~ /nzbget { +location /nzbget { # enable the next two lines for http auth #auth_basic "Restricted"; #auth_basic_user_file /config/nginx/.htpasswd; @@ -15,21 +15,21 @@ location ^~ /nzbget { proxy_pass http://$upstream_nzbget:6789; } -location ^~ /nzbget/jsonrpc { +location ~ ^/nzbget(/.*)?/jsonrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } -location ^~ /nzbget/jsonprpc { +location ~ ^/nzbget(/.*)?/jsonprpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } -location ^~ /nzbget/xmlrpc { +location ~ ^/nzbget(/.*)?/xmlrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; From 0c5520e512b53b0af43f486b32d2af677a3c6ecc Mon Sep 17 00:00:00 2001 From: HalianElf <28244771+HalianElf@users.noreply.github.com> Date: Fri, 14 Feb 2020 12:23:56 -0500 Subject: [PATCH 2/6] Update RPC endpoints Allows credentials to be passed through the URL for apps like LunaSea --- nzbget.subdomain.conf.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample index de33466..b5c45be 100644 --- a/nzbget.subdomain.conf.sample +++ b/nzbget.subdomain.conf.sample @@ -28,21 +28,21 @@ server { proxy_pass http://$upstream_nzbget:6789; } - location ^~ /nzbget/jsonrpc { + location ~ ^/nzbget(/.*)?/jsonrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } - location ^~ /nzbget/jsonprpc { + location ~ ^/nzbget(/.*)?/jsonprpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } - location ^~ /nzbget/xmlrpc { + location ~ ^/nzbget(/.*)?/xmlrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; From 1712bb6572dd85cde29e9da69f154c0e97bba852 Mon Sep 17 00:00:00 2001 From: HalianElf <28244771+HalianElf@users.noreply.github.com> Date: Fri, 14 Feb 2020 21:41:51 -0500 Subject: [PATCH 3/6] Change regex --- nzbget.subdomain.conf.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample index b5c45be..a7725c1 100644 --- a/nzbget.subdomain.conf.sample +++ b/nzbget.subdomain.conf.sample @@ -28,21 +28,21 @@ server { proxy_pass http://$upstream_nzbget:6789; } - location ~ ^/nzbget(/.*)?/jsonrpc { + location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/jsonrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } - location ~ ^/nzbget(/.*)?/jsonprpc { + location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/jsonprpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } - location ~ ^/nzbget(/.*)?/xmlrpc { + location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/xmlrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; From c13e6f8f0f878a0d8e82660d12456eedce719f09 Mon Sep 17 00:00:00 2001 From: HalianElf <28244771+HalianElf@users.noreply.github.com> Date: Fri, 14 Feb 2020 21:43:01 -0500 Subject: [PATCH 4/6] Change regex --- nzbget.subfolder.conf.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample index 1238a88..1c17611 100644 --- a/nzbget.subfolder.conf.sample +++ b/nzbget.subfolder.conf.sample @@ -15,21 +15,21 @@ location /nzbget { proxy_pass http://$upstream_nzbget:6789; } -location ~ ^/nzbget(/.*)?/jsonrpc { +location ~ /nzbget(/[^\/:]*:[^\/:]*)?/jsonrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } -location ~ ^/nzbget(/.*)?/jsonprpc { +location ~ /nzbget(/[^\/:]*:[^\/:]*)?/jsonprpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } -location ~ ^/nzbget(/.*)?/xmlrpc { +location ~ /nzbget(/[^\/:]*:[^\/:]*)?/xmlrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; From e36e28adc7efaec077ea0707b17f414132e753fe Mon Sep 17 00:00:00 2001 From: HalianElf <28244771+HalianElf@users.noreply.github.com> Date: Fri, 14 Feb 2020 22:04:44 -0500 Subject: [PATCH 5/6] Remove : from password --- nzbget.subfolder.conf.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample index 1c17611..fd17df6 100644 --- a/nzbget.subfolder.conf.sample +++ b/nzbget.subfolder.conf.sample @@ -15,21 +15,21 @@ location /nzbget { proxy_pass http://$upstream_nzbget:6789; } -location ~ /nzbget(/[^\/:]*:[^\/:]*)?/jsonrpc { +location ~ /nzbget(/[^\/:]*:[^\/]*)?/jsonrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } -location ~ /nzbget(/[^\/:]*:[^\/:]*)?/jsonprpc { +location ~ /nzbget(/[^\/:]*:[^\/]*)?/jsonprpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } -location ~ /nzbget(/[^\/:]*:[^\/:]*)?/xmlrpc { +location ~ /nzbget(/[^\/:]*:[^\/]*)?/xmlrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; From 638eb59bd183f926f137f79aa0b8ac2a4663eebb Mon Sep 17 00:00:00 2001 From: HalianElf <28244771+HalianElf@users.noreply.github.com> Date: Fri, 14 Feb 2020 22:05:17 -0500 Subject: [PATCH 6/6] Remove : from password --- nzbget.subdomain.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample index a7725c1..a3f4872 100644 --- a/nzbget.subdomain.conf.sample +++ b/nzbget.subdomain.conf.sample @@ -35,14 +35,14 @@ server { proxy_pass http://$upstream_nzbget:6789; } - location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/jsonprpc { + location ~ (/nzbget)?(/[^\/:]*:[^\/]*)?/jsonprpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget; proxy_pass http://$upstream_nzbget:6789; } - location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/xmlrpc { + location ~ (/nzbget)?(/[^\/:]*:[^\/]*)?/xmlrpc { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_nzbget nzbget;