From 6cb8d70b63052e38eab1f336afd896cc547b9c7b Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Fri, 22 Jul 2022 10:06:35 +0200
Subject: [PATCH] fix: replace generic nginx webui cfg by their respective ones

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
---
 scripts/fluidd.sh   | 2 +-
 scripts/mainsail.sh | 2 +-
 scripts/nginx.sh    | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/fluidd.sh b/scripts/fluidd.sh
index 0523c4f..5d0b151 100644
--- a/scripts/fluidd.sh
+++ b/scripts/fluidd.sh
@@ -349,7 +349,7 @@ function fluidd_port_check() {
         select_fluidd_port
       fi
     else
-      DEFAULT_PORT=$(grep listen "${KIAUH_SRCDIR}/resources/klipper_webui_nginx.cfg" | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
+      DEFAULT_PORT=$(grep listen "${KIAUH_SRCDIR}/resources/fluidd" | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
       SET_LISTEN_PORT=${DEFAULT_PORT}
     fi
     SET_NGINX_CFG="true"
diff --git a/scripts/mainsail.sh b/scripts/mainsail.sh
index c268425..a207923 100644
--- a/scripts/mainsail.sh
+++ b/scripts/mainsail.sh
@@ -516,7 +516,7 @@ function mainsail_port_check() {
         select_mainsail_port
       fi
     else
-      DEFAULT_PORT=$(grep listen "${KIAUH_SRCDIR}/resources/klipper_webui_nginx.cfg" | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
+      DEFAULT_PORT=$(grep listen "${KIAUH_SRCDIR}/resources/mainsail" | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
       SET_LISTEN_PORT=${DEFAULT_PORT}
     fi
     SET_NGINX_CFG="true"
diff --git a/scripts/nginx.sh b/scripts/nginx.sh
index ebe3b71..49f967c 100644
--- a/scripts/nginx.sh
+++ b/scripts/nginx.sh
@@ -100,7 +100,9 @@ function match_nginx_configs() {
   local common_vars="${NGINX_CONFD}/common_vars.conf"
   local mainsail_nginx_cfg="/etc/nginx/sites-available/mainsail"
   local fluidd_nginx_cfg="/etc/nginx/sites-available/fluidd"
-  local upstreams_webcams mainsail_webcams fluidd_webcams
+  local upstreams_webcams
+  local mainsail_webcams
+  local fluidd_webcams
 
   ### reinstall nginx configs if the amount of upstreams don't match anymore
   upstreams_webcams=$(grep -Ec "mjpgstreamer" "/etc/nginx/conf.d/upstreams.conf")
@@ -124,7 +126,7 @@ function match_nginx_configs() {
     status_msg "Outdated Mainsail config found! Updating ..."
 
     sudo rm -f "${mainsail_nginx_cfg}"
-    sudo cp "${RESOURCES}/klipper_webui_nginx.cfg" "${mainsail_nginx_cfg}"
+    sudo cp "${RESOURCES}/mainsail" "${mainsail_nginx_cfg}"
     sudo sed -i "s/<<UI>>/mainsail/g" "${mainsail_nginx_cfg}"
     sudo sed -i "/root/s/pi/${USER}/" "${mainsail_nginx_cfg}"
     sudo sed -i "s/listen\s[0-9]*;/listen ${mainsail_port};/" "${mainsail_nginx_cfg}"
@@ -138,7 +140,7 @@ function match_nginx_configs() {
     status_msg "Outdated Fluidd config found! Updating ..."
 
     sudo rm -f "${fluidd_nginx_cfg}"
-    sudo cp "${RESOURCES}/klipper_webui_nginx.cfg" "${fluidd_nginx_cfg}"
+    sudo cp "${RESOURCES}/fluidd" "${fluidd_nginx_cfg}"
     sudo sed -i "s/<<UI>>/fluidd/g" "${fluidd_nginx_cfg}"
     sudo sed -i "/root/s/pi/${USER}/" "${fluidd_nginx_cfg}"
     sudo sed -i "s/listen\s[0-9]*;/listen ${fluidd_port};/" "${fluidd_nginx_cfg}"