Update .app files

CHANGELOG.md

@@ -514,7 +514,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
   - #### 🐞 Bug Fixes
 
-    - fix Node.js version drift [@asylumexp](https://github.com/asylumexp) ([#16111](https://github.com/community-scripts/ProxmoxVE/pull/16111))
     - UmlautAdaptarr: use the Debian 13 Microsoft repo with its 2025 signing key [@angusmaul](https://github.com/angusmaul) ([#16077](https://github.com/community-scripts/ProxmoxVE/pull/16077))
     - fix(bazarr): store data in /var/lib/bazarr instead of inside /opt/bazarr [@angusmaul](https://github.com/angusmaul) ([#16098](https://github.com/community-scripts/ProxmoxVE/pull/16098))
     - Cloudflare-DDNS: store API token in a 600 env file and build the binary at install time [@angusmaul](https://github.com/angusmaul) ([#16100](https://github.com/community-scripts/ProxmoxVE/pull/16100))

ct/dispatcharr.sh

@@ -100,7 +100,7 @@ server {
     }
 }
 EOF
-    nginx_enable_site dispatcharr.conf
+    systemctl reload nginx
     msg_ok "Migrated Nginx Configuration"
   fi
 

ct/feishin.sh

@@ -59,7 +59,9 @@ 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
-    nginx_enable_site feishin
+    ln -sf /etc/nginx/sites-available/feishin /etc/nginx/sites-enabled/feishin
+    rm -f /etc/nginx/sites-enabled/default
+    systemctl restart nginx
     msg_ok "Published Web Assets"
 
     msg_ok "Updated successfully!"

ct/paymenter.sh

@@ -34,9 +34,8 @@ function update_script() {
   if [[ "$CURRENT_PHP" != "8.3" ]]; then
     PHP_VERSION="8.3" PHP_FPM="YES" setup_php
     setup_composer
-    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
+    sed -i 's|php8\.2-fpm\.sock|php8.3-fpm.sock|g' /etc/nginx/sites-available/paymenter.conf
+    $STD systemctl reload nginx
   fi
 
   if check_for_gh_release "paymenter" "paymenter/paymenter"; then

ct/rackula.sh

@@ -62,9 +62,9 @@ function update_script() {
     msg_ok "Updated Configuration"
 
     msg_info "Starting Services"
+    $STD nginx -t
     systemctl daemon-reload
-    nginx_enable_site rackula
-    systemctl start rackula-api
+    systemctl start nginx rackula-api
     msg_ok "Started Services"
     msg_ok "Updated successfully!"
   fi

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
-      nginx_enable_site romm
+      systemctl reload nginx
     fi
     msg_ok "Updated ROMM"
 

ct/sparkyfitness.sh

@@ -93,8 +93,7 @@ EOF
     msg_ok "Refreshed SparkyFitness Service"
 
     msg_info "Starting Services"
-    $STD systemctl start sparkyfitness-server
-    nginx_enable_site sparkyfitness
+    $STD systemctl start sparkyfitness-server nginx
     msg_ok "Started Services"
     msg_ok "Updated successfully!"
   fi

install/2fauth-install.sh

@@ -49,7 +49,6 @@ chmod -R 755 /opt/2fauth
 msg_ok "Setup 2fauth"
 
 msg_info "Configure Service"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/conf.d/2fauth.conf
 server {
         listen 80;
@@ -68,7 +67,7 @@ server {
         error_page 404 /index.php;
 
         location ~ \.php\$ {
-                fastcgi_pass unix:${PHP_SOCK};
+                fastcgi_pass unix:/var/run/php/php${PHP_VERSION}-fpm.sock;
                 fastcgi_param SCRIPT_FILENAME \$realpath_root\$fastcgi_script_name;
                 include fastcgi_params;
         }

install/affine-install.sh

@@ -207,7 +207,9 @@ server {
     }
 }
 EOF
-nginx_enable_site affine.conf
+ln -sf /etc/nginx/sites-available/affine.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+systemctl enable -q --now nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/babybuddy-install.sh

@@ -89,7 +89,10 @@ server {
 }
 EOF
 
-nginx_enable_site babybuddy
+ln -sf /etc/nginx/sites-available/babybuddy /etc/nginx/sites-enabled/babybuddy
+rm /etc/nginx/sites-enabled/default
+systemctl enable -q --now nginx
+service nginx reload
 msg_ok "Configured NGINX"
 
 motd_ssh

install/bar-assistant-install.sh

@@ -73,7 +73,6 @@ $STD npm run build
 msg_ok "Installed Salt Rim"
 
 msg_info "Creating Service"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/sites-available/barassistant.conf
 server {
     listen 80 default_server;
@@ -127,7 +126,7 @@ server {
     error_page 404 /index.php;
 
     location ~ ^/index\.php(/|$) {
-        fastcgi_pass unix:${PHP_SOCK};
+        fastcgi_pass unix:/var/run/php/php$PHPVER-fpm.sock;
         fastcgi_param SCRIPT_FILENAME \$realpath_root\$fastcgi_script_name;
         include fastcgi_params;
         fastcgi_hide_header X-Powered-By;
@@ -149,7 +148,9 @@ server {
 }
 EOF
 
-nginx_enable_site barassistant.conf
+ln -s /etc/nginx/sites-available/barassistant.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Created Service"
 
 motd_ssh

install/checkmate-install.sh

@@ -122,7 +122,9 @@ server {
   }
 }
 EOF
-nginx_enable_site checkmate
+ln -sf /etc/nginx/sites-available/checkmate /etc/nginx/sites-enabled/checkmate
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Configured Nginx Reverse Proxy"
 
 motd_ssh

install/databasus-install.sh

@@ -185,7 +185,11 @@ server {
     }
 }
 EOF
-nginx_enable_site databasus
+ln -sf /etc/nginx/sites-available/databasus /etc/nginx/sites-enabled/databasus
+rm -f /etc/nginx/sites-enabled/default
+$STD nginx -t
+$STD systemctl enable -q --now nginx
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/dawarich-install.sh

@@ -174,7 +174,9 @@ server {
     }
 }
 EOF
-nginx_enable_site dawarich.conf
+ln -sf /etc/nginx/sites-available/dawarich.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+systemctl enable -q --now nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/discourse-install.sh

@@ -207,7 +207,10 @@ server {
   }
 }
 EOF
-nginx_enable_site discourse
+ln -sf /etc/nginx/sites-available/discourse /etc/nginx/sites-enabled/discourse
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl enable --now nginx
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/dispatcharr-install.sh

@@ -139,7 +139,9 @@ server {
     }
 }
 EOF
-nginx_enable_site dispatcharr.conf
+ln -sf /etc/nginx/sites-available/dispatcharr.conf /etc/nginx/sites-enabled/dispatcharr.conf
+rm -f /etc/nginx/sites-enabled/default
+systemctl restart nginx
 msg_ok "Configured Nginx"
 
 msg_info "Creating Services"

install/espconnect-install.sh

@@ -46,7 +46,11 @@ server {
     }
 }
 EOF
-nginx_enable_site espconnect
+ln -sf /etc/nginx/sites-available/espconnect /etc/nginx/sites-enabled/espconnect
+rm -f /etc/nginx/sites-enabled/default
+$STD nginx -t
+systemctl enable -q nginx
+systemctl restart nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/excalidash-install.sh

@@ -108,7 +108,9 @@ server {
     }
 }
 EOF
-nginx_enable_site excalidash
+ln -sf /etc/nginx/sites-available/excalidash /etc/nginx/sites-enabled/excalidash
+rm -f /etc/nginx/sites-enabled/default
+systemctl reload nginx
 msg_ok "Configured Nginx"
 
 msg_info "Creating Service"

install/feishin-install.sh

@@ -57,7 +57,10 @@ set +a
 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
 
-nginx_enable_site feishin
+ln -sf /etc/nginx/sites-available/feishin /etc/nginx/sites-enabled/feishin
+rm -f /etc/nginx/sites-enabled/default
+systemctl enable -q --now nginx
+systemctl reload nginx
 msg_ok "Published Web Assets"
 
 motd_ssh

install/geopulse-install.sh

@@ -178,7 +178,10 @@ server {
     error_log /var/log/geopulse/nginx/error.log;
 }
 EOF
-nginx_enable_site geopulse.conf
+ln -sf /etc/nginx/sites-available/geopulse.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+systemctl enable -q --now nginx
+systemctl reload nginx
 msg_ok "Configured Nginx"
 
 msg_info "Creating Admin Helper"

install/grav-install.sh

@@ -26,7 +26,9 @@ chown -R www-data:www-data /opt/grav
 
 msg_info "Configuring Nginx"
 PHP_VER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-PHP_FPM_SOCK=$(get_php_fpm_socket)
+PHP_FPM_SOCK=$(find /run/php -maxdepth 1 -name "php*-fpm.sock" -type s | sort -V | tail -1)
+unlink /etc/nginx/sites-enabled/default
+rm -f /etc/nginx/sites-available/default
 cat <<EOF >/etc/nginx/sites-available/grav
 server {
     listen 80;
@@ -97,8 +99,11 @@ server {
     }
 }
 EOF
+ln -sf /etc/nginx/sites-available/grav /etc/nginx/sites-enabled/grav
 systemctl enable -q --now php${PHP_VER}-fpm
-nginx_enable_site grav
+$STD nginx -t
+systemctl enable -q --now nginx
+$STD nginx -s reload
 msg_ok "Configured Nginx"
 
 motd_ssh

install/investbrain-install.sh

@@ -115,7 +115,6 @@ chmod -R 775 /opt/investbrain/bootstrap/cache
 msg_ok "Installed Investbrain"
 
 msg_info "Configuring Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/sites-available/investbrain.conf
 server {
     listen 8000 default_server;
@@ -136,7 +135,7 @@ server {
     }
 
     location ~ \.php\$ {
-        fastcgi_pass unix:${PHP_SOCK};
+        fastcgi_pass unix:/var/run/php/php${PHP_VERSION}-fpm.sock;
         fastcgi_param SCRIPT_FILENAME \$realpath_root\$fastcgi_script_name;
         include fastcgi_params;
         fastcgi_hide_header X-Powered-By;
@@ -151,7 +150,9 @@ server {
     access_log /var/log/nginx/investbrain_access.log;
 }
 EOF
-nginx_enable_site investbrain.conf
+ln -sf /etc/nginx/sites-available/investbrain.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 msg_info "Setting up Supervisor"

install/invoiceninja-install.sh

@@ -110,7 +110,6 @@ chown -R www-data:www-data /opt/invoiceninja
 msg_ok "Set up Database"
 
 msg_info "Configuring Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<'EOF' >/etc/nginx/sites-available/invoiceninja
 server {
     listen 8080;
@@ -131,7 +130,7 @@ server {
     }
 
     location = /index.php {
-        fastcgi_pass unix:__PHP_SOCK__;
+        fastcgi_pass unix:/run/php/php8.4-fpm.sock;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;
         fastcgi_param HTTP_X_FORWARDED_HOST $http_host;
@@ -152,8 +151,9 @@ server {
 }
 EOF
 
-sed -i "s|__PHP_SOCK__|${PHP_SOCK}|" /etc/nginx/sites-available/invoiceninja
-nginx_enable_site invoiceninja
+ln -sf /etc/nginx/sites-available/invoiceninja /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 msg_info "Setting up Queue Worker"

install/invoiceshelf-install.sh

@@ -56,11 +56,10 @@ msg_ok "Set up InvoiceShelf"
 
 msg_info "Configuring Caddy"
 PHP_VER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/caddy/Caddyfile
 :80 {
     root * /opt/invoiceshelf/public
-    php_fastcgi unix/${PHP_SOCK}
+    php_fastcgi unix//run/php/php${PHP_VER}-fpm.sock
     file_server
     encode gzip
 }

install/kitchenowl-install.sh

@@ -86,6 +86,7 @@ systemctl enable -q --now kitchenowl
 msg_ok "Created and Started Service"
 
 msg_info "Configuring Nginx"
+rm -f /etc/nginx/sites-enabled/default
 cat <<'EOF' >/etc/nginx/sites-available/kitchenowl.conf
 server {
     listen 80;
@@ -133,7 +134,9 @@ server {
     }
 }
 EOF
-nginx_enable_site kitchenowl.conf
+ln -sf /etc/nginx/sites-available/kitchenowl.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/koel-install.sh

@@ -129,7 +129,6 @@ $STD systemctl restart php8.4-fpm
 msg_ok "Tuned PHP-FPM"
 
 msg_info "Configuring Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<'EOF' >/etc/nginx/sites-available/koel
 server {
     listen 80;
@@ -157,7 +156,7 @@ server {
 
     location ~ \.php$ {
         try_files $uri $uri/ /index.php?$args;
-        fastcgi_pass unix:__PHP_SOCK__;
+        fastcgi_pass unix:/run/php/php8.4-fpm.sock;
         fastcgi_index index.php;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_intercept_errors on;
@@ -172,8 +171,9 @@ server {
     }
 }
 EOF
-sed -i "s|__PHP_SOCK__|${PHP_SOCK}|" /etc/nginx/sites-available/koel
-nginx_enable_site koel
+rm -f /etc/nginx/sites-enabled/default
+ln -sf /etc/nginx/sites-available/koel /etc/nginx/sites-enabled/koel
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 msg_info "Setting up Cron Job"

install/librenms-install.sh

@@ -80,7 +80,7 @@ sed -i "s/listen = \/run\/php\/php8.4-fpm.sock/listen = \/run\/php-fpm-librenms.
 msg_ok "Configured PHP-FPM"
 
 msg_info "Configure Nginx"
-cat <<EOF >/etc/nginx/sites-available/librenms
+cat <<EOF >/etc/nginx/sites-enabled/librenms
 server {
  listen      80;
  server_name ${LOCAL_IP};
@@ -103,7 +103,8 @@ server {
  }
 }
 EOF
-nginx_enable_site librenms
+rm /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 systemctl restart php8.4-fpm
 msg_ok "Configured Nginx"
 

install/linkding-install.sh

@@ -115,8 +115,10 @@ server {
     }
 }
 EOF
-systemctl enable -q --now linkding linkding-tasks
-nginx_enable_site linkding
+$STD rm -f /etc/nginx/sites-enabled/default
+$STD ln -sf /etc/nginx/sites-available/linkding /etc/nginx/sites-enabled/linkding
+systemctl enable -q --now nginx linkding linkding-tasks
+systemctl restart nginx
 msg_ok "Created Services"
 
 motd_ssh

install/lychee-install.sh

@@ -56,11 +56,10 @@ chown -R www-data:www-data /opt/lychee
 
 msg_info "Configuring Caddy"
 PHP_VER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/caddy/Caddyfile
 :80 {
     root * /opt/lychee/public
-    php_fastcgi unix/${PHP_SOCK}
+    php_fastcgi unix//run/php/php${PHP_VER}-fpm.sock
     file_server
     encode gzip
 }

install/manyfold-install.sh

@@ -134,7 +134,9 @@ server {
     }
 }
 EOF
-nginx_enable_site manyfold.conf
+ln -s /etc/nginx/sites-available/manyfold.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Created Services"
 
 motd_ssh

install/mastodon-install.sh

@@ -262,8 +262,12 @@ server {
   }
 }
 EOF
+ln -sf /etc/nginx/sites-available/mastodon /etc/nginx/sites-enabled/mastodon
+rm -f /etc/nginx/sites-enabled/default
+$STD nginx -t
 systemctl enable -q --now redis-server
-nginx_enable_site mastodon
+systemctl enable -q --now nginx
+systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/matomo-install.sh

@@ -45,13 +45,12 @@ msg_ok "Set up Matomo"
 
 msg_info "Configuring Caddy"
 PHP_VER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/caddy/Caddyfile
 :80 {
     root * /opt/matomo
     @blocked path /config /config/* /tmp /tmp/* /.* /.*/*
     respond @blocked 403
-    php_fastcgi unix/${PHP_SOCK}
+    php_fastcgi unix//run/php/php${PHP_VER}-fpm.sock
     file_server
     encode gzip
 }

install/netboot-xyz-install.sh

@@ -59,6 +59,7 @@ USE_ORIGINAL_FILENAME=true fetch_and_deploy_gh_release "netboot-xyz-multiarch-im
 USE_ORIGINAL_FILENAME=true fetch_and_deploy_gh_release "netboot-xyz-checksums" "netbootxyz/netboot.xyz" "singlefile" "latest" "/var/www/html" "netboot.xyz-sha256-checksums.txt"
 
 msg_info "Configuring Webserver"
+rm -f /etc/nginx/sites-enabled/default
 cat <<'EOF' >/etc/nginx/sites-available/netboot-xyz
 server {
     listen 80 default_server;
@@ -82,7 +83,8 @@ server {
     }
 }
 EOF
-nginx_enable_site netboot-xyz
+ln -sf /etc/nginx/sites-available/netboot-xyz /etc/nginx/sites-enabled/netboot-xyz
+$STD systemctl reload nginx
 msg_ok "Configured Webserver"
 
 msg_info "Configuring TFTP Server"

install/omnitools-install.sh

@@ -55,7 +55,11 @@ server {
 }
 EOF
 
-nginx_enable_site omnitools
+ln -sf /etc/nginx/sites-available/omnitools /etc/nginx/sites-enabled/omnitools
+rm -f /etc/nginx/sites-enabled/default
+$STD nginx -t
+systemctl enable -q --now nginx
+systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/ots-install.sh

@@ -62,7 +62,9 @@ server {
 }
 EOF
 
-nginx_enable_site ots.conf
+ln -s /etc/nginx/sites-available/ots.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Configured nginx"
 
 msg_info "Creating Services"

install/paymenter-install.sh

@@ -57,7 +57,6 @@ $STD php artisan app:user:create paymenter admin admin@paymenter.org paymenter 1
 msg_ok "Created Admin User"
 
 msg_info "Configuring Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/sites-available/paymenter.conf
 server {
     listen 80;
@@ -73,7 +72,7 @@ server {
 
     location ~ \.php\$ {
         include snippets/fastcgi-php.conf;
-        fastcgi_pass unix:${PHP_SOCK};
+        fastcgi_pass unix:/var/run/php/php8.3-fpm.sock;
         fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
         include fastcgi_params;
     }
@@ -83,7 +82,9 @@ server {
     }
 }
 EOF
-nginx_enable_site paymenter.conf
+ln -s /etc/nginx/sites-available/paymenter.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 chown -R www-data:www-data /opt/paymenter/*
 msg_ok "Configured Nginx"
 

install/plane-install.sh

@@ -376,7 +376,9 @@ server {
     }
 }
 EOF
-nginx_enable_site plane.conf
+ln -sf /etc/nginx/sites-available/plane.conf /etc/nginx/sites-enabled/plane.conf
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/postiz-install.sh

@@ -236,7 +236,11 @@ server {
   }
 }
 EOF
-nginx_enable_site postiz
+ln -sf /etc/nginx/sites-available/postiz /etc/nginx/sites-enabled/postiz
+rm -f /etc/nginx/sites-enabled/default
+$STD nginx -t
+systemctl enable -q nginx
+systemctl reload -q nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/poznote-install.sh

@@ -29,7 +29,6 @@ chown -R www-data:www-data /var/www/html
 msg_ok "Deployed Poznote"
 
 msg_info "Configuring Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/sites-available/poznote
 server {
     listen 8040;
@@ -42,7 +41,7 @@ server {
 
     location ~ \.php$ {
         include fastcgi_params;
-        fastcgi_pass unix:${PHP_SOCK};
+        fastcgi_pass unix:/run/php/php8.4-fpm.sock;
         fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
         fastcgi_param DOCUMENT_ROOT \$document_root;
     }
@@ -52,7 +51,11 @@ server {
     }
 }
 EOF
-nginx_enable_site poznote
+ln -sf /etc/nginx/sites-available/poznote /etc/nginx/sites-enabled/poznote
+rm -f /etc/nginx/sites-enabled/default
+$STD nginx -t
+systemctl enable -q --now nginx
+systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/privatebin-install.sh

@@ -37,7 +37,6 @@ systemctl restart php8.2-fpm
 msg_ok "Configured PHP"
 
 msg_info "Configuring Universal Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/sites-available/privatebin.conf
 server {
     listen 80 default_server;
@@ -61,7 +60,7 @@ server {
 
     location ~ \.php\$ {
         include snippets/fastcgi-php.conf;
-        fastcgi_pass unix:${PHP_SOCK};
+        fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
         fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
         include fastcgi_params;
     }
@@ -76,7 +75,9 @@ server {
     add_header X-XSS-Protection "1; mode=block";
 }
 EOF
-nginx_enable_site privatebin.conf
+ln -s /etc/nginx/sites-available/privatebin.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+systemctl reload nginx
 msg_ok "Nginx Configured"
 
 motd_ssh

install/rackula-install.sh

@@ -55,7 +55,9 @@ msg_ok "Set up Rackula"
 
 msg_info "Configuring nginx"
 cp /opt/rackula/config/nginx.conf /etc/nginx/sites-available/rackula
-nginx_enable_site rackula
+rm -f /etc/nginx/sites-enabled/default
+ln -sf /etc/nginx/sites-available/rackula /etc/nginx/sites-enabled/rackula
+$STD nginx -t
 msg_ok "Configured nginx"
 
 msg_info "Creating Services"

install/shlink-install.sh

@@ -93,7 +93,10 @@ server {
     }
 }
 EOF
-  nginx_enable_site shlink-web-client
+  ln -sf /etc/nginx/sites-available/shlink-web-client /etc/nginx/sites-enabled/shlink-web-client
+  rm -f /etc/nginx/sites-enabled/default
+  systemctl enable -q nginx
+  $STD systemctl restart nginx
   msg_ok "Set up Web Client"
 fi
 

install/snipeit-install.sh

@@ -40,7 +40,6 @@ $STD php artisan key:generate --force
 msg_ok "Configured Snipe-IT"
 
 msg_info "Creating Service"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/conf.d/snipeit.conf
 server {
         listen 80;
@@ -56,7 +55,7 @@ server {
         location ~ \.php\$ {
                 include fastcgi.conf;
                 include snippets/fastcgi-php.conf;
-                fastcgi_pass unix:${PHP_SOCK};
+                fastcgi_pass unix:/run/php/php8.3-fpm.sock;
                 fastcgi_split_path_info ^(.+\.php)(/.+)\$;
                 fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
                 include fastcgi_params;

install/solidtime-install.sh

@@ -68,11 +68,10 @@ msg_ok "Set up SolidTime"
 
 msg_info "Configuring Caddy"
 PHP_VER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/caddy/Caddyfile
 :80 {
     root * /opt/solidtime/public
-    php_fastcgi unix/${PHP_SOCK}
+    php_fastcgi unix//run/php/php${PHP_VER}-fpm.sock
     file_server
     encode gzip
 }

install/sparkyfitness-install.sh

@@ -91,7 +91,11 @@ sed \
   -e 's|root /usr/share/nginx/html;|root /var/www/sparkyfitness;|g' \
   -e 's|server_name localhost;|server_name _;|g' \
   "/opt/sparkyfitness/docker/nginx.conf" >/etc/nginx/sites-available/sparkyfitness
-nginx_enable_site sparkyfitness
+ln -sf /etc/nginx/sites-available/sparkyfitness /etc/nginx/sites-enabled/sparkyfitness
+rm -f /etc/nginx/sites-enabled/default
+$STD nginx -t
+$STD systemctl enable -q --now nginx
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/speedtest-tracker-install.sh

@@ -120,7 +120,6 @@ EOF
 msg_ok "Set up Scheduler"
 
 msg_info "Configuring Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/sites-available/speedtest-tracker
 server {
     listen 80;
@@ -144,7 +143,7 @@ server {
     error_page 404 /index.php;
 
     location ~ \.php$ {
-        fastcgi_pass unix:${PHP_SOCK};
+        fastcgi_pass unix:/var/run/php/php8.4-fpm.sock;
         fastcgi_param SCRIPT_FILENAME \$realpath_root\$fastcgi_script_name;
         include fastcgi_params;
     }
@@ -155,7 +154,9 @@ server {
 }
 EOF
 
-nginx_enable_site speedtest-tracker
+ln -sf /etc/nginx/sites-available/speedtest-tracker /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/wallabag-install.sh

@@ -93,7 +93,6 @@ chmod -R 755 /opt/wallabag/{var,web/assets}
 msg_ok "Installed Wallabag"
 
 msg_info "Configuring Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<'EOF' >/etc/nginx/sites-available/wallabag
 server {
     listen 8000;
@@ -111,7 +110,7 @@ server {
     }
 
     location ~ ^/app\.php(/|$) {
-        fastcgi_pass unix:__PHP_SOCK__;
+        fastcgi_pass unix:/run/php/php8.3-fpm.sock;
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
@@ -132,8 +131,9 @@ server {
 }
 EOF
 
-sed -i "s|__PHP_SOCK__|${PHP_SOCK}|" /etc/nginx/sites-available/wallabag
-nginx_enable_site wallabag
+ln -sf /etc/nginx/sites-available/wallabag /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 msg_info "Enabling Services"

install/warracker-install.sh

@@ -69,7 +69,10 @@ sed -i \
     -e "s|/var/www/html|/opt/warracker/frontend|g" \
     -e "s/client_max_body_size __NGINX_MAX_BODY_SIZE_CONFIG_VALUE__/client_max_body_size 32M/" \
     /etc/nginx/sites-available/warracker.conf
-nginx_enable_site warracker.conf
+ln -s /etc/nginx/sites-available/warracker.conf /etc/nginx/sites-enabled/warracker.conf
+rm /etc/nginx/sites-enabled/default
+systemctl restart nginx
+
 msg_ok "Configured Nginx"
 
 msg_info "Creating systemd services"

install/webtrees-install.sh

@@ -32,11 +32,10 @@ msg_ok "Set up Webtrees"
 
 msg_info "Configuring Caddy"
 PHP_VER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/caddy/Caddyfile
 :80 {
     root * /opt/webtrees
-    php_fastcgi unix/${PHP_SOCK}
+    php_fastcgi unix//run/php/php${PHP_VER}-fpm.sock
     file_server
     encode gzip
 }

install/yourls-install.sh

@@ -48,7 +48,6 @@ chown -R www-data:www-data /opt/yourls
 msg_ok "Configured YOURLS"
 
 msg_info "Configuring Nginx"
-PHP_SOCK=$(get_php_fpm_socket)
 cat <<EOF >/etc/nginx/sites-available/yourls
 server {
     listen 80 default_server;
@@ -63,7 +62,7 @@ server {
     location ~ \.php\$ {
         try_files \$uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)\$;
-        fastcgi_pass unix:${PHP_SOCK};
+        fastcgi_pass unix:/run/php/php8.3-fpm.sock;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
@@ -80,7 +79,11 @@ server {
     }
 }
 EOF
-nginx_enable_site yourls
+ln -sf /etc/nginx/sites-available/yourls /etc/nginx/sites-enabled/yourls
+rm -f /etc/nginx/sites-enabled/default
+$STD nginx -t
+systemctl enable -q --now nginx
+systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh

install/zammad-install.sh

@@ -65,7 +65,9 @@ msg_ok "Installed Zammad"
 msg_info "Setup Services"
 cp /opt/zammad/contrib/nginx/zammad.conf /etc/nginx/sites-available/zammad.conf
 sed -i "s/server_name localhost;/server_name $LOCAL_IP;/g" /etc/nginx/sites-available/zammad.conf
-nginx_enable_site zammad.conf
+ln -sf /etc/nginx/sites-available/zammad.conf /etc/nginx/sites-enabled/
+rm -f /etc/nginx/sites-enabled/default
+$STD systemctl reload nginx
 msg_ok "Created Service"
 
 motd_ssh

misc/tools.func

@@ -8173,88 +8173,6 @@ EOF
   msg_ok "Setup PHP ${INSTALLED_VERSION}"
 }
 
-# ------------------------------------------------------------------------------
-# Resolves the path of the active PHP-FPM unix socket.
-#
-# Description:
-#   - Prefers the socket of ${PHP_VERSION} when that variable is set, which is
-#     the deterministic case directly after setup_php ran
-#   - Falls back to the highest version found below /run/php
-#   - Webserver-agnostic: works for nginx (fastcgi_pass) and Caddy (php_fastcgi)
-#
-# Notes:
-#   - Prints the path to stdout, diagnostics go to stderr, so the result can be
-#     captured via command substitution
-#   - Deliberately avoids `head -n1`: it closes the pipe early and with
-#     `set -o pipefail` (see catch_errors) SIGPIPE would abort the install
-#   - php-fpm has to be running, the socket only exists after the service start
-#
-# Usage:
-#   PHP_SOCK=$(get_php_fpm_socket)
-#   echo "fastcgi_pass unix:${PHP_SOCK};"
-# ------------------------------------------------------------------------------
-get_php_fpm_socket() {
-  local sock
-
-  if [[ -n "${PHP_VERSION:-}" && -S "/run/php/php${PHP_VERSION}-fpm.sock" ]]; then
-    echo "/run/php/php${PHP_VERSION}-fpm.sock"
-    return 0
-  fi
-
-  sock=$(find /run/php -maxdepth 1 -name "php*-fpm.sock" -type s 2>/dev/null | sort -V | tail -1)
-
-  if [[ -z "$sock" ]]; then
-    msg_error "No active PHP-FPM socket found under /run/php"
-    return 1
-  fi
-
-  echo "$sock"
-}
-
-# ------------------------------------------------------------------------------
-# Enables an nginx site, validates the configuration and reloads the service.
-#
-# Description:
-#   - Removes the packaged default vhost (idempotent, unlike `unlink`)
-#   - Links the site from sites-available into sites-enabled
-#   - Runs `nginx -t` and aborts before a broken config reaches a running service
-#   - Enables the unit so nginx survives a reboot, then restarts it via
-#     safe_service_restart so a failed start is actually reported
-#
-# Variables:
-#   $1 - site name, has to exist as /etc/nginx/sites-available/<name>
-#
-# Usage:
-#   cat <<EOF >/etc/nginx/sites-available/myapp
-#   ...
-#   EOF
-#   nginx_enable_site myapp
-# ------------------------------------------------------------------------------
-nginx_enable_site() {
-  local site="${1:-}"
-
-  if [[ -z "$site" ]]; then
-    msg_error "nginx_enable_site: no site name given"
-    return 1
-  fi
-
-  if [[ ! -f "/etc/nginx/sites-available/${site}" ]]; then
-    msg_error "nginx site config not found: /etc/nginx/sites-available/${site}"
-    return 1
-  fi
-
-  rm -f /etc/nginx/sites-enabled/default /etc/nginx/sites-available/default
-  ln -sf "/etc/nginx/sites-available/${site}" "/etc/nginx/sites-enabled/${site}"
-
-  if ! $STD nginx -t; then
-    msg_error "nginx configuration test failed for site '${site}'"
-    return 1
-  fi
-
-  $STD systemctl enable -q nginx
-  safe_service_restart nginx
-}
-
 # ------------------------------------------------------------------------------
 # Installs or upgrades PostgreSQL and optional extensions/modules.
 #