Standardize nginx setup in install scripts

Refactors many install scripts to use the shared `nginx_enable_site` helper instead of manual symlink/default-site/reload sequences, making webserver setup more consistent and less error-prone. It also replaces hardcoded PHP-FPM socket paths with `get_php_fpm_socket` (including templated substitutions where needed) across nginx and caddy configs to improve compatibility with varying PHP versions and socket locations.
This commit is contained in:
MickLesk
2026-07-28 14:57:58 +02:00
parent f862ce0c13
commit b7688ff97a
44 changed files with 77 additions and 156 deletions
+2 -7
View File
@@ -26,9 +26,7 @@ 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=$(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
PHP_FPM_SOCK=$(get_php_fpm_socket)
cat <<EOF >/etc/nginx/sites-available/grav
server {
listen 80;
@@ -99,11 +97,8 @@ server {
}
}
EOF
ln -sf /etc/nginx/sites-available/grav /etc/nginx/sites-enabled/grav
systemctl enable -q --now php${PHP_VER}-fpm
$STD nginx -t
systemctl enable -q --now nginx
$STD nginx -s reload
nginx_enable_site grav
msg_ok "Configured Nginx"
motd_ssh