From af111bf4190a53fb1d5034e9836c24e80cfc3b5b Mon Sep 17 00:00:00 2001
From: MickLesk <mickey.leskowitz@gmail.com>
Date: Tue, 28 Jul 2026 15:02:51 +0200
Subject: [PATCH] Refactor nginx management to use helper

Replace direct nginx systemctl/ln calls with the `nginx_enable_site` helper function across multiple update scripts. Also use `get_php_fpm_socket` in paymenter.sh for dynamic PHP socket path instead of hardcoded version string.
---
 ct/dispatcharr.sh   | 2 +-
 ct/feishin.sh       | 4 +---
 ct/paymenter.sh     | 5 +++--
 ct/rackula.sh       | 4 ++--
 ct/romm.sh          | 2 +-
 ct/sparkyfitness.sh | 3 ++-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ct/dispatcharr.sh b/ct/dispatcharr.sh
index 09ecbcab1..ad8a98aa2 100644
--- a/ct/dispatcharr.sh
+++ b/ct/dispatcharr.sh
@@ -100,7 +100,7 @@ server {
     }
 }
 EOF
-    systemctl reload nginx
+    nginx_enable_site dispatcharr.conf
     msg_ok "Migrated Nginx Configuration"
   fi
 
diff --git a/ct/feishin.sh b/ct/feishin.sh
index dec1ece1b..be352a2d2 100644
--- a/ct/feishin.sh
+++ b/ct/feishin.sh
@@ -59,9 +59,7 @@ function update_script() {
 
     envsubst </opt/feishin/settings.js.template >/etc/nginx/conf.d/settings.js
     envsubst '${PUBLIC_PATH}' </opt/feishin/ng.conf.template >/etc/nginx/sites-available/feishin
-    ln -sf /etc/nginx/sites-available/feishin /etc/nginx/sites-enabled/feishin
-    rm -f /etc/nginx/sites-enabled/default
-    systemctl restart nginx
+    nginx_enable_site feishin
     msg_ok "Published Web Assets"
 
     msg_ok "Updated successfully!"
diff --git a/ct/paymenter.sh b/ct/paymenter.sh
index 6eaee71f9..7059717e1 100644
--- a/ct/paymenter.sh
+++ b/ct/paymenter.sh
@@ -34,8 +34,9 @@ function update_script() {
   if [[ "$CURRENT_PHP" != "8.3" ]]; then
     PHP_VERSION="8.3" PHP_FPM="YES" setup_php
     setup_composer
-    sed -i 's|php8\.2-fpm\.sock|php8.3-fpm.sock|g' /etc/nginx/sites-available/paymenter.conf
-    $STD systemctl reload nginx
+    PHP_SOCK=$(get_php_fpm_socket)
+    sed -i "s|fastcgi_pass unix:.*|fastcgi_pass unix:${PHP_SOCK};|" /etc/nginx/sites-available/paymenter.conf
+    nginx_enable_site paymenter.conf
   fi
 
   if check_for_gh_release "paymenter" "paymenter/paymenter"; then
diff --git a/ct/rackula.sh b/ct/rackula.sh
index c0b15a9b9..0ee40b885 100755
--- a/ct/rackula.sh
+++ b/ct/rackula.sh
@@ -62,9 +62,9 @@ function update_script() {
     msg_ok "Updated Configuration"
 
     msg_info "Starting Services"
-    $STD nginx -t
     systemctl daemon-reload
-    systemctl start nginx rackula-api
+    nginx_enable_site rackula
+    systemctl start rackula-api
     msg_ok "Started Services"
     msg_ok "Updated successfully!"
   fi
diff --git a/ct/romm.sh b/ct/romm.sh
index eb05d2168..4391d2b4c 100644
--- a/ct/romm.sh
+++ b/ct/romm.sh
@@ -75,7 +75,7 @@ function update_script() {
       systemctl reload angie
     elif [[ -f /etc/nginx/sites-available/romm ]]; then
       sed -i "s|alias .*/library/;|alias ${ROMM_BASE}/library/;|" /etc/nginx/sites-available/romm
-      systemctl reload nginx
+      nginx_enable_site romm
     fi
     msg_ok "Updated ROMM"
 
diff --git a/ct/sparkyfitness.sh b/ct/sparkyfitness.sh
index 3bdce225b..310cb805a 100644
--- a/ct/sparkyfitness.sh
+++ b/ct/sparkyfitness.sh
@@ -93,7 +93,8 @@ EOF
     msg_ok "Refreshed SparkyFitness Service"
 
     msg_info "Starting Services"
-    $STD systemctl start sparkyfitness-server nginx
+    $STD systemctl start sparkyfitness-server
+    nginx_enable_site sparkyfitness
     msg_ok "Started Services"
     msg_ok "Updated successfully!"
   fi