From 08d7b0520d243e72136c8040ebfa107f86da7275 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Mon, 25 Jan 2021 10:14:36 -0600
Subject: [PATCH] feat: simplify nginx config

---
 .../root/etc/nginx/sites-available/fluidd     | 36 ++-----------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/modules/fluidd/filesystem/root/etc/nginx/sites-available/fluidd b/src/modules/fluidd/filesystem/root/etc/nginx/sites-available/fluidd
index 96682095d..4482642e8 100644
--- a/src/modules/fluidd/filesystem/root/etc/nginx/sites-available/fluidd
+++ b/src/modules/fluidd/filesystem/root/etc/nginx/sites-available/fluidd
@@ -31,30 +31,6 @@ server {
         add_header Cache-Control "no-store, no-cache, must-revalidate";
     }
 
-    location /printer {
-        proxy_pass http://apiserver/printer;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme $scheme;
-    }
-
-    location /api {
-        proxy_pass http://apiserver/api;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme $scheme;
-    }
-
-    location /access {
-        proxy_pass http://apiserver/access;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme $scheme;
-    }
-
     location /websocket {
         proxy_pass http://apiserver/websocket;
         proxy_http_version 1.1;
@@ -66,22 +42,14 @@ server {
         proxy_read_timeout 86400;
     }
 
-    location /machine {
-        proxy_pass http://apiserver/machine;
+    location ~ ^/(printer|api|access|machine|server)/ {
+        proxy_pass http://apiserver$request_uri;
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Scheme $scheme;
     }
 
-    location /server {
-        proxy_pass http://apiserver/server;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme $scheme;
-    }
-	
     location /webcam/ {
         proxy_pass http://mjpgstreamer/;
     }