From d1d08c17af8b92d361c3b3e687f9adea7c7e9a01 Mon Sep 17 00:00:00 2001 From: mcaron1234 Date: Thu, 14 Mar 2019 16:10:21 -0700 Subject: [PATCH 1/4] Add resiliosync subdomain proxy-conf for nginx --- resiliosync.subdomain.conf.sample | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 resiliosync.subdomain.conf.sample diff --git a/resiliosync.subdomain.conf.sample b/resiliosync.subdomain.conf.sample new file mode 100644 index 0000000..7c9fc6c --- /dev/null +++ b/resiliosync.subdomain.conf.sample @@ -0,0 +1,30 @@ +# make sure that your dns has a cname set for resiliosync and that your resiliosync container is not using a base url + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name resiliosync.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + # enable for ldap auth, fill in ldap details in ldap.conf + #include /config/nginx/ldap.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable the next two lines for ldap auth + #auth_request /auth; + #error_page 401 =200 /login; + + include /config/nginx/proxy.conf; + resolver 127.0.0.11 valid=30s; + set $upstream_resiliosync resiliosync; + proxy_pass http://$upstream_resiliosync:8888; + } +} From 480c099651b39a5f158e5e4ba9d1ae5cff4aa39a Mon Sep 17 00:00:00 2001 From: mcaron1234 Date: Mon, 18 Mar 2019 14:21:58 -0700 Subject: [PATCH 2/4] Add hyphens to servername and variable values, to match expected container name --- resiliosync.subdomain.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resiliosync.subdomain.conf.sample b/resiliosync.subdomain.conf.sample index 7c9fc6c..070ee63 100644 --- a/resiliosync.subdomain.conf.sample +++ b/resiliosync.subdomain.conf.sample @@ -4,7 +4,7 @@ server { listen 443 ssl; listen [::]:443 ssl; - server_name resiliosync.*; + server_name resilio-sync.*; include /config/nginx/ssl.conf; @@ -24,7 +24,7 @@ server { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; - set $upstream_resiliosync resiliosync; + set $upstream_resiliosync resilio-sync; proxy_pass http://$upstream_resiliosync:8888; } } From ca9cd1526d3af4d4b93e7a0a2853a57381b659dd Mon Sep 17 00:00:00 2001 From: mcaron1234 Date: Mon, 18 Mar 2019 15:14:29 -0700 Subject: [PATCH 3/4] update instructions at top with correct hyphenation --- resiliosync.subdomain.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resiliosync.subdomain.conf.sample b/resiliosync.subdomain.conf.sample index 070ee63..9b4d4eb 100644 --- a/resiliosync.subdomain.conf.sample +++ b/resiliosync.subdomain.conf.sample @@ -1,4 +1,4 @@ -# make sure that your dns has a cname set for resiliosync and that your resiliosync container is not using a base url +# make sure that your dns has a cname set for resilio-sync and that your resilio-sync container is not using a base url server { listen 443 ssl; From 7d71640c1e33145d6561fae89057621f542768e1 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 21 Mar 2019 18:39:22 -0400 Subject: [PATCH 4/4] Rename resiliosync.subdomain.conf.sample to resilio-sync.subdomain.conf.sample --- ...nc.subdomain.conf.sample => resilio-sync.subdomain.conf.sample | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resiliosync.subdomain.conf.sample => resilio-sync.subdomain.conf.sample (100%) diff --git a/resiliosync.subdomain.conf.sample b/resilio-sync.subdomain.conf.sample similarity index 100% rename from resiliosync.subdomain.conf.sample rename to resilio-sync.subdomain.conf.sample