add server override includes and redirect legacy endpoints (#541)

* add server override includes

* adjusting directory name

.gitignore

@@ -78,6 +78,10 @@ docker/data
 # Docker override
 docker-compose.override.yml
 
+# Nginx custom server overrides
+docker/nginx/conf.d/server-override/*
+!docker/nginx/conf.d/server-override/example
+
 # Cache files
 __pycache__
 /.idea/

docker/nginx/conf.d/client.conf

@@ -50,6 +50,8 @@ server {
 	client_max_body_size 128k;
 
 	# legacy endpoint rewrite
+	rewrite /portals /skynet/portals permanent;
+	rewrite /stats /skynet/stats permanent;
 	rewrite /skynet/blacklist /skynet/blocklist permanent;
 
 	location / {
@@ -87,15 +89,6 @@ server {
 		proxy_pass http://siad/skynet/blocklist;
 	}
 
-	location /portals {
-		include /etc/nginx/conf.d/include/cors;
-
-		proxy_cache skynet;
-		proxy_cache_valid any 1m; # cache portals for 1 minute
-		proxy_set_header User-Agent: Sia-Agent;
-		proxy_pass http://siad/skynet/portals;
-	}
-
 	location /skynet/portals {
 		include /etc/nginx/conf.d/include/cors;
 
@@ -105,16 +98,6 @@ server {
 		proxy_pass http://siad/skynet/portals;
 	}
 
-	location /stats {
-		include /etc/nginx/conf.d/include/cors;
-
-		proxy_cache skynet;
-		proxy_cache_valid any 10m; # cache stats for 10 minutes
-		proxy_set_header User-Agent: Sia-Agent;
-		proxy_read_timeout 5m; # extend the read timeout
-		proxy_pass http://siad/skynet/stats;
-	}
-
 	location /skynet/stats {
 		include /etc/nginx/conf.d/include/cors;
 
@@ -308,4 +291,7 @@ server {
 
 		proxy_pass http://127.0.0.1/$uri?attachment=true&$args;
 	}
+
+	# include custom locations, specific to the server
+	include /etc/nginx/conf.d/server-override/*;
 }

docker/nginx/conf.d/server-override/example

@@ -0,0 +1,7 @@
+# Every file from within this directory will be included in the server block
+# of the nginx configuration, at the very end. See client.conf.
+#
+# Example:
+# location /blog {
+#     root /var/www/blog;
+# }