From 6b74c59d156007627a4f3ab38ccf17474ed67b08 Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Tue, 28 Sep 2021 00:10:16 +0200
Subject: [PATCH] script: add function to match nginx configurations

this should fix a common issue where mainsail/fluidd was installed with a more up2date nginx config which didn't match with a previously configured upstreams.conf.
this should also cover cases where the upstreams.conf is more up2date than the corresponding interface configs.
---
 scripts/install_klipper_webui.sh | 57 ++++++++++++++++++++++++++++++--
 scripts/update.sh                |  2 ++
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/scripts/install_klipper_webui.sh b/scripts/install_klipper_webui.sh
index 908a4e4..5513652 100755
--- a/scripts/install_klipper_webui.sh
+++ b/scripts/install_klipper_webui.sh
@@ -336,13 +336,66 @@ fetch_webui_ports(){
   ### and write them to ~/.kiauh.ini
   WEBIFS=(mainsail fluidd octoprint dwc2)
   for interface in "${WEBIFS[@]}"; do
-    if [ -f "/etc/nginx/sites-enabled/${interface}" ]; then
+    if [ -f "/etc/nginx/sites-available/${interface}" ]; then
+      port=$(grep -E "listen" /etc/nginx/sites-available/$interface | sed -e 's/^[[:space:]]*//' | sed -e 's/;$//' | cut -d" " -f2)
       if [ ! -n "$(grep -E "${interface}_port" $INI_FILE)" ]; then
-        port=$(grep -E "listen" /etc/nginx/sites-available/$interface | sed -e 's/^[[:space:]]*//' | sed -e 's/;$//' | cut -d" " -f2)
+        sed -i '$a'"${interface}_port=${port}" $INI_FILE
+      else
+        sed -i "/^${interface}_port/d" $INI_FILE
         sed -i '$a'"${interface}_port=${port}" $INI_FILE
       fi
     else
         sed -i "/^${interface}_port/d" $INI_FILE
     fi
   done
+}
+
+match_nginx_configs(){
+  ### reinstall nginx configs if the amount of upstreams don't match anymore
+  source_kiauh_ini
+  cfg_updated="false"
+  mainsail_nginx_cfg="/etc/nginx/sites-available/mainsail"
+  fluidd_nginx_cfg="/etc/nginx/sites-available/fluidd"
+  upstreams_webcams=$(grep -E "mjpgstreamer" /etc/nginx/conf.d/upstreams.conf | wc -l)
+  status_msg "Checking validity of NGINX configurations ..."
+  if [ -e "$mainsail_nginx_cfg" ]; then
+    mainsail_webcams=$(grep -E "mjpgstreamer" "$mainsail_nginx_cfg" | wc -l)
+  fi
+  if [ -e "$fluidd_nginx_cfg" ]; then
+    fluidd_webcams=$(grep -E "mjpgstreamer" "$fluidd_nginx_cfg" | wc -l)
+  fi
+  ### check for outdated upstreams.conf
+  if [[ "$upstreams_webcams" -lt "$mainsail_webcams" ]] || [[ "$upstreams_webcams" -lt "$fluidd_webcams" ]]; then
+    status_msg "Outdated upstreams.conf found! Updating ..."
+    setup_moonraker_nginx_cfg
+    cfg_updated="true"
+  fi
+  ### check for outdated mainsail config
+  if [ -e "$mainsail_nginx_cfg" ]; then
+    if [[ "$upstreams_webcams" -gt "$mainsail_webcams" ]]; then
+      status_msg "Outdated Mainsail config found! Updating ..."
+      sudo rm -f "$mainsail_nginx_cfg"
+      sudo cp "${SRCDIR}/kiauh/resources/klipper_webui_nginx.cfg" "$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 80;/listen $mainsail_port;/" "$mainsail_nginx_cfg"
+      cfg_updated="true" && ok_msg "Done!"
+    fi
+  fi
+  ### check for outdated fluidd config
+  if [ -e "$fluidd_nginx_cfg" ]; then
+    if [[ "$upstreams_webcams" -gt "$fluidd_webcams" ]]; then
+      status_msg "Outdated Fluidd config found! Updating ..."
+      sudo rm -f "$fluidd_nginx_cfg"
+      sudo cp "${SRCDIR}/kiauh/resources/klipper_webui_nginx.cfg" "$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 80;/listen $fluidd_port;/" "$fluidd_nginx_cfg"
+      cfg_updated="true" && ok_msg "Done!"
+    fi
+  fi
+  ### only restart nginx if configs were updated
+  if [ "$cfg_updated" == "true" ]; then
+    restart_nginx && unset cfg_updated
+  fi
 }
\ No newline at end of file
diff --git a/scripts/update.sh b/scripts/update.sh
index b37233d..8a453b3 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -266,6 +266,7 @@ update_mainsail(){
   bb4u "mainsail"
   status_msg "Updating Mainsail ..."
   mainsail_setup
+  match_nginx_configs
   symlink_webui_nginx_log "mainsail"
 }
 
@@ -273,6 +274,7 @@ update_fluidd(){
   bb4u "fluidd"
   status_msg "Updating Fluidd ..."
   fluidd_setup
+  match_nginx_configs
   symlink_webui_nginx_log "fluidd"
 }