fix: redesign
This commit is contained in:
u00lipp committed
1 parent
af4b37ab39
commit
76ace993d6
9 files changed
+172
-176
No files matched your search
@@ -0,0 +1,22 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
SERVER_NAME="${SERVER_NAME:-$(hostname -f 2>/dev/null || hostname)}"
|
||||
export SERVER_NAME
|
||||
|
||||
# Ensure dirs
|
||||
mkdir -p /etc/nginx/http.d /etc/nginx/conf.d /run/nginx /run/php
|
||||
|
||||
# Render vhost ONLY into http.d so it's inside http{} context
|
||||
if [ -f /etc/nginx/templates/default.conf.template ]; then
|
||||
envsubst '$SERVER_NAME' < /etc/nginx/templates/default.conf.template > /etc/nginx/http.d/default.conf
|
||||
else
|
||||
echo "[entrypoint] ERROR: missing /etc/nginx/templates/default.conf.template" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "[entrypoint] Using SERVER_NAME=$SERVER_NAME"
|
||||
nginx -t || { echo "[entrypoint] nginx config test failed" >&2; cat /var/log/nginx/error.log || true; exit 1; }
|
||||
|
||||
exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
set -e
|
||||
|
||||
# Default: DO NOT run artisan on boot (avoid provider issues)
|
||||
: "${ARTISAN_BOOT:=0}"
|
||||
: "${ARTISAN_DB_WAIT:=0}"
|
||||
: "${ARTISAN_MIGRATE:=0}"
|
||||
: "${ARTISAN_VERBOSE:=0}"
|
||||
|
||||
log() { [ "$ARTISAN_VERBOSE" = "1" ] && echo "[entrypoint] $*"; }
|
||||
warn() { echo "[entrypoint] $*" 1>&2; }
|
||||
|
||||
cd /var/www/html || true
|
||||
|
||||
if [ "$ARTISAN_BOOT" != "1" ] || [ ! -f artisan ]; then
|
||||
[ ! -f artisan ] && warn "artisan not found; skipping artisan."
|
||||
exec /usr/bin/supervisord -c /etc/supervisord.conf
|
||||
fi
|
||||
|
||||
if [ "$ARTISAN_DB_WAIT" = "1" ] && [ -n "$DB_HOST" ] && [ -n "$DB_PORT" ]; then
|
||||
log "Waiting for DB ${DB_HOST}:${DB_PORT} ..."
|
||||
i=0
|
||||
until php -r '
|
||||
$h=getenv("DB_HOST"); $p=(int)getenv("DB_PORT")?:5432;
|
||||
$s=@fsockopen($h,$p,$errno,$errstr,1.0);
|
||||
if($s){fclose($s); exit(0);} exit(1);
|
||||
'; do
|
||||
i=$((i+1)); [ $i -gt 60 ] && warn "DB wait timed out after 60s" && break
|
||||
sleep 1
|
||||
done
|
||||
fi
|
||||
|
||||
if php artisan package:discover --ansi; then
|
||||
php artisan config:cache --ansi || warn "config:cache failed"
|
||||
php artisan route:cache --ansi || warn "route:cache failed"
|
||||
php artisan view:cache --ansi || warn "view:cache failed"
|
||||
else
|
||||
warn "package:discover failed — skipping caches."
|
||||
fi
|
||||
|
||||
[ "$ARTISAN_MIGRATE" = "1" ] && php artisan migrate --force --no-interaction --ansi || true
|
||||
|
||||
exec /usr/bin/supervisord -c /etc/supervisord.conf
|
||||
@@ -1,44 +0,0 @@
|
||||
server {
|
||||
listen 80 default_server;
|
||||
server_name _;
|
||||
|
||||
root /var/www/html/public;
|
||||
index index.php;
|
||||
|
||||
location = /healthz { return 200 "ok\n"; add_header Content-Type text/plain; }
|
||||
|
||||
location ~* \.(?:css|js|mjs|map|jpg|jpeg|png|gif|ico|svg|webp|avif|ttf|otf|woff|woff2)$ {
|
||||
access_log off; log_not_found off;
|
||||
expires 7d;
|
||||
add_header Cache-Control "public, max-age=604800, immutable";
|
||||
try_files $uri =404;
|
||||
}
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
include fastcgi_params;
|
||||
fastcgi_index index.php;
|
||||
fastcgi_pass unix:/run/php/php-fpm.sock;
|
||||
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
|
||||
fastcgi_param DOCUMENT_ROOT $realpath_root;
|
||||
fastcgi_read_timeout 60s;
|
||||
fastcgi_buffering on;
|
||||
fastcgi_buffers 16 16k;
|
||||
fastcgi_buffer_size 32k;
|
||||
}
|
||||
|
||||
client_max_body_size 64m;
|
||||
|
||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||
add_header X-Content-Type-Options "nosniff" always;
|
||||
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
|
||||
|
||||
gzip on;
|
||||
gzip_comp_level 5;
|
||||
gzip_min_length 256;
|
||||
gzip_proxied any;
|
||||
gzip_types text/plain text/css application/json application/javascript application/xml+rss application/xml application/x-font-ttf font/opentype image/svg+xml;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
user nginx;
|
||||
worker_processes auto;
|
||||
error_log /var/log/nginx/error.log warn;
|
||||
pid /run/nginx.pid;
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
http {
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||
'$status $body_bytes_sent "$http_referer" '
|
||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||
|
||||
access_log /dev/stdout main;
|
||||
error_log /dev/stderr warn;
|
||||
|
||||
sendfile on;
|
||||
keepalive_timeout 65;
|
||||
|
||||
# Server Blöcke sind NICHT hier!
|
||||
# Stattdessen in:
|
||||
include /etc/nginx/conf.d/*.conf;
|
||||
include /etc/nginx/http.d/*.conf;
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name ${SERVER_NAME};
|
||||
|
||||
root /var/www/html/public;
|
||||
index index.php;
|
||||
|
||||
# Cache-Control for static files
|
||||
location ~* \.(?:ico|css|js|gif|jpe?g|png|svg|woff2?|eot|ttf|otf|webp|avif)$ {
|
||||
expires 7d;
|
||||
add_header Cache-Control "public, max-age=604800, immutable";
|
||||
try_files $uri =404;
|
||||
}
|
||||
|
||||
# Main application entry point
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
}
|
||||
|
||||
# PHP processing
|
||||
location ~ \.php$ {
|
||||
include fastcgi_params;
|
||||
fastcgi_index index.php;
|
||||
fastcgi_pass 127.0.0.1:9000;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param DOCUMENT_ROOT $document_root;
|
||||
fastcgi_read_timeout 60s;
|
||||
fastcgi_buffering on;
|
||||
fastcgi_buffers 16 16k;
|
||||
fastcgi_buffer_size 32k;
|
||||
}
|
||||
|
||||
# Client upload size
|
||||
client_max_body_size 64m;
|
||||
|
||||
# Security headers
|
||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||
add_header X-Content-Type-Options "nosniff" always;
|
||||
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
|
||||
|
||||
# Gzip compression
|
||||
gzip on;
|
||||
gzip_comp_level 5;
|
||||
gzip_min_length 256;
|
||||
gzip_proxied any;
|
||||
gzip_types text/plain text/css application/json application/javascript application/xml+rss application/xml application/x-font-ttf font/opentype image/svg+xml application/vnd.ms-fontobject;
|
||||
}
|
||||
@@ -1,16 +1,3 @@
|
||||
[www]
|
||||
listen = /run/php/php-fpm.sock
|
||||
listen.owner = www-data
|
||||
listen.group = nginx
|
||||
listen.mode = 0660
|
||||
user = www-data
|
||||
group = www-data
|
||||
|
||||
pm = dynamic
|
||||
pm.max_children = 10
|
||||
pm.start_servers = 2
|
||||
pm.min_spare_servers = 2
|
||||
pm.max_spare_servers = 5
|
||||
|
||||
clear_env = yes
|
||||
env[PATH] = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
listen = 127.0.0.1:9000
|
||||
user = nginx
|
||||
group = nginx
|
||||
+11
-8
@@ -1,23 +1,26 @@
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
logfile=/var/log/supervisor/supervisord.log
|
||||
pidfile=/run/supervisord.pid
|
||||
|
||||
[program:php-fpm]
|
||||
command=/usr/local/sbin/php-fpm -F
|
||||
; run as root (master); FPM will drop to www-data for workers
|
||||
command=/usr/sbin/php-fpm82 -F
|
||||
autostart=true
|
||||
autorestart=true
|
||||
startretries=3
|
||||
priority=10
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile=/dev/fd/1
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile=/dev/fd/2
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:nginx]
|
||||
command=/usr/sbin/nginx -g "daemon off;"
|
||||
; run as root (master); nginx will use 'user nginx;' for workers
|
||||
command=/usr/sbin/nginx -g 'daemon off;'
|
||||
autostart=true
|
||||
autorestart=true
|
||||
startretries=3
|
||||
priority=20
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile=/dev/fd/1
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile=/dev/fd/2
|
||||
stderr_logfile_maxbytes=0
|
||||
Reference in new issue
Block a user