Merge pull request #527 from linuxserver/syncthing

Syncthing
This commit is contained in:
Eric Nemchik 2023-02-13 09:46:23 -06:00 committed by GitHub
commit 15712472d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 79 additions and 53 deletions

View file

@ -11,3 +11,4 @@ trim_trailing_whitespace = false
[{*.conf,*.conf.sample}] [{*.conf,*.conf.sample}]
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
trim_trailing_whitespace = true

View file

@ -23,8 +23,8 @@ Conversely subdomain reverse proxying does not require special accommodation by
Make sure that your default site config contains the following lines in the appropriate spots as seen in the default version: Make sure that your default site config contains the following lines in the appropriate spots as seen in the default version:
1) For subfolder methods: `include /config/nginx/proxy-confs/*.subfolder.conf;` 1. For subfolder methods: `include /config/nginx/proxy-confs/*.subfolder.conf;`
2) For subdomain methods: `include /config/nginx/proxy-confs/*.subdomain.conf;` 2. For subdomain methods: `include /config/nginx/proxy-confs/*.subdomain.conf;`
### Ensure you have a custom docker network ### Ensure you have a custom docker network
@ -42,8 +42,8 @@ If the reverse proxied containers are not reachable via dns or they are running
### Rename the required proxy configs ### Rename the required proxy configs
1) Rename the conf files and remove the `.sample` at the end (ie. `sonarr.subfolder.conf`) 1. Rename the conf files and remove the `.sample` at the end (ie. `sonarr.subfolder.conf`)
2) Restart the swag container 2. Restart the swag container
### Make any necessary changes detailed in the config ### Make any necessary changes detailed in the config

View file

@ -9,7 +9,6 @@ location /todo {
} }
location ^~ /todo/ { location ^~ /todo/ {
# enable the next two lines for http auth # enable the next two lines for http auth
#auth_basic "Restricted"; #auth_basic "Restricted";
#auth_basic_user_file /config/nginx/.htpasswd; #auth_basic_user_file /config/nginx/.htpasswd;

View file

@ -1,4 +1,4 @@
## Version 2023/02/05 ## Version 2023/02/12
# make sure that your syncthing container is named syncthing # make sure that your syncthing container is named syncthing
# make sure that your dns has a cname set for syncthing # make sure that your dns has a cname set for syncthing
@ -42,5 +42,17 @@ server {
set $upstream_proto http; set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port; proxy_pass $upstream_proto://$upstream_app:$upstream_port;
proxy_hide_header Authorization;
}
location ~ (/syncthing)?/rest {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_app syncthing;
set $upstream_port 8384;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
proxy_hide_header Authorization;
} }
} }

View file

@ -1,4 +1,4 @@
## Version 2023/02/05 ## Version 2023/02/12
# make sure that your syncthing container is named syncthing # make sure that your syncthing container is named syncthing
# syncthing does not require a base url setting # syncthing does not require a base url setting
@ -28,4 +28,17 @@ location ^~ /syncthing/ {
proxy_pass $upstream_proto://$upstream_app:$upstream_port; proxy_pass $upstream_proto://$upstream_app:$upstream_port;
rewrite /syncthing(.*) $1 break; rewrite /syncthing(.*) $1 break;
proxy_hide_header Authorization;
}
location ^~ /syncthing/rest {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_app syncthing;
set $upstream_port 8384;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
rewrite /syncthing(.*) $1 break;
proxy_hide_header Authorization;
} }

View file

@ -33,6 +33,7 @@ location /tvheadend/ {
# enable for Authentik (requires authentik-server.conf in the server block) # enable for Authentik (requires authentik-server.conf in the server block)
#include /config/nginx/authentik-location.conf; #include /config/nginx/authentik-location.conf;
include /config/nginx/proxy.conf; include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf; include /config/nginx/resolver.conf;