Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Eric Nemchik 2020-05-30 08:34:47 -05:00
commit 7cd2138c74
141 changed files with 811 additions and 23 deletions

View file

@ -13,6 +13,9 @@ server {
# enable for ldap auth, fill in ldap details in ldap.conf
#include /config/nginx/ldap.conf;
# enable for Authelia
#include /config/nginx/authelia-server.conf;
location / {
# enable the next two lines for http auth
#auth_basic "Restricted";
@ -22,6 +25,9 @@ server {
#auth_request /auth;
#error_page 401 =200 /login;
# enable for Authelia
#include /config/nginx/authelia-location.conf;
include /config/nginx/proxy.conf;
resolver 127.0.0.11 valid=30s;
set $upstream_app radarr;