ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-08-03 07:53:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix #412

Browse Source 
Signed-off-by: Zoey <zoey@z0ey.de>
This commit is contained in:
Zoey
2023-09-26 08:27:48 +02:00
parent 6e62aa2ea1
commit e7b07fc96e
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -144,7 +144,7 @@ location / {
fastcgi_pass php82; fastcgi_pass php82;
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
if (!-f $document_root$fastcgi_script_name) { if (!-f $document_root$fastcgi_script_name) {
return 404 return 404;
} }
} }
} }

38
rootfs/bin/start.sh
View File

@@ -160,7 +160,7 @@ apk add --no-cache php81-fpm
mkdir -vp /data/php mkdir -vp /data/php
cp -vrnT /etc/php81 /data/php/81 cp -vrnT /etc/php81 /data/php/81
sed -i "s|listen =.*|listen = /var/run/php81.sock|" /data/php/81/php-fpm.d/www.conf sed -i "s|listen =.*|listen = /run/php81.sock|" /data/php/81/php-fpm.d/www.conf
sed -i "s|include=.*|include=/data/php/81/php-fpm.d/*.conf|g" /data/php/81/php-fpm.conf sed -i "s|include=.*|include=/data/php/81/php-fpm.d/*.conf|g" /data/php/81/php-fpm.conf
elif [ "$FULLCLEAN" = "true" ]; then elif [ "$FULLCLEAN" = "true" ]; then
@@ -192,7 +192,7 @@ apk add --no-cache php82-fpm
mkdir -vp /data/php mkdir -vp /data/php
cp -vrnT /etc/php82 /data/php/82 cp -vrnT /etc/php82 /data/php/82
sed -i "s|listen =.*|listen = /var/run/php82.sock|" /data/php/82/php-fpm.d/www.conf sed -i "s|listen =.*|listen = /run/php82.sock|" /data/php/82/php-fpm.d/www.conf
sed -i "s|include=.*|include=/data/php/82/php-fpm.d/*.conf|g" /data/php/82/php-fpm.conf sed -i "s|include=.*|include=/data/php/82/php-fpm.d/*.conf|g" /data/php/82/php-fpm.conf
elif [ "$FULLCLEAN" = "true" ]; then elif [ "$FULLCLEAN" = "true" ]; then
@@ -551,13 +551,13 @@ sed -i "s|ssl_certificate .*|ssl_certificate $NPM_CERT;|g" /data/nginx/default.c
sed -i "s|ssl_certificate_key .*|ssl_certificate_key $NPM_KEY;|g" /data/nginx/default.conf sed -i "s|ssl_certificate_key .*|ssl_certificate_key $NPM_KEY;|g" /data/nginx/default.conf
if [ -n "$NPM_CHAIN" ]; then sed -i "s|ssl_trusted_certificate .*|ssl_trusted_certificate $NPM_CHAIN;|g" /data/nginx/default.conf; fi if [ -n "$NPM_CHAIN" ]; then sed -i "s|ssl_trusted_certificate .*|ssl_trusted_certificate $NPM_CHAIN;|g" /data/nginx/default.conf; fi
find /data/nginx -type f -name '*.conf' -exec sed -i "s|add_header alt-svc 'h3=\":443\"; ma=86400, h3-29=\":443\"; ma=86400';|add_header Alt-Svc 'h3=\":443\"; ma=86400';|g" {} \;
find /data/nginx -type f -name '*.conf' -exec sed -i "s|add_header alt-svc 'h3=\":443\";|add_header Alt-Svc 'h3=\":443\"; ma=86400';|g" {} \;
find /data/nginx -type f -name '*.conf' -exec sed -i "/ma=86400, h3-29=\":443\";/d" {} \;
find /data/nginx -type f -name '*.conf' -exec sed -i "/^[[:space:]]*ma=86400';[[:space:]]*$/d" {} \;
nginxbeautifier -s 4 -r /data/nginx nginxbeautifier -s 4 -r /data/nginx
#find /data/nginx -type f -name '*.conf' -exec sed -i "s|add_header alt-svc 'h3=\":443\"; ma=86400, h3-29=\":443\"; ma=86400';|add_header Alt-Svc 'h3=\":443\"; ma=86400';|g" {} \;
#find /data/nginx -type f -name '*.conf' -exec sed -i "s|add_header alt-svc 'h3=\":443\";|add_header Alt-Svc 'h3=\":443\"; ma=86400';|g" {} \;
#find /data/nginx -type f -name '*.conf' -exec sed -i "/ma=86400, h3-29=\":443\";/d" {} \;
#find /data/nginx -type f -name '*.conf' -exec sed -i "/^[[:space:]]*ma=86400';[[:space:]]*$/d" {} \;
rm -f /usr/local/nginx/logs/nginx.pid rm -f /usr/local/nginx/logs/nginx.pid
chmod -R 770 /data/tls \ chmod -R 770 /data/tls \
@@ -568,7 +568,7 @@ if [ "$PUID" != "0" ]; then
if id -u npm > /dev/null 2>&1; then if id -u npm > /dev/null 2>&1; then
usermod -u "$PUID" npm usermod -u "$PUID" npm
else else
useradd -o -u "$PUID" -U -d /tmp/npmhome -s /bin/false npm useradd -o -u "$PUID" -U -d /tmp/npmhome -s /sbin/nologin npm
fi fi
if [ -z "$(getent group npm | cut -d: -f3)" ]; then if [ -z "$(getent group npm | cut -d: -f3)" ]; then
groupadd -f -g "$PGID" npm groupadd -f -g "$PGID" npm
@@ -588,15 +588,15 @@ if [ "$PUID" != "0" ]; then
chown -R "$PUID:$PGID" /usr/local/certbot \ chown -R "$PUID:$PGID" /usr/local/certbot \
/usr/local/nginx \ /usr/local/nginx \
/data \ /data \
/var \ /run \
/tmp /tmp
if [ "$PHP81" = "true" ]; then if [ "$PHP81" = "true" ]; then
sed -i "s|user =.*|user = $PUID|" /data/php/81/php-fpm.d/www.conf sed -i "s|user =.*|;user = root|" /data/php/81/php-fpm.d/www.conf
sed -i "s|group =.*|group = $PGID|" /data/php/81/php-fpm.d/www.conf sed -i "s|group =.*|;group = root|" /data/php/81/php-fpm.d/www.conf
fi fi
if [ "$PHP82" = "true" ]; then if [ "$PHP82" = "true" ]; then
sed -i "s|user =.*|user = $PUID|" /data/php/82/php-fpm.d/www.conf sed -i "s|user =.*|;user = root|" /data/php/82/php-fpm.d/www.conf
sed -i "s|group =.*|group = $PGID|" /data/php/82/php-fpm.d/www.conf sed -i "s|group =.*|;group = root|" /data/php/82/php-fpm.d/www.conf
fi fi
sed -i "s|user root;|#user root;|g" /usr/local/nginx/conf/nginx.conf sed -i "s|user root;|#user root;|g" /usr/local/nginx/conf/nginx.conf
sudo -Eu npm launch.sh sudo -Eu npm launch.sh
@@ -604,16 +604,16 @@ else
chown -R 0:0 /usr/local/certbot \ chown -R 0:0 /usr/local/certbot \
/usr/local/nginx \ /usr/local/nginx \
/data \ /data \
/var \ /run \
/tmp /tmp
if [ "$PHP81" = "true" ]; then if [ "$PHP81" = "true" ]; then
sed -i "s|user =.*|user = 0|" /data/php/81/php-fpm.d/www.conf sed -i "s|;user =.*|user = root|" /data/php/81/php-fpm.d/www.conf
sed -i "s|group =.*|group = 0|" /data/php/81/php-fpm.d/www.conf sed -i "s|;group =.*|group = root|" /data/php/81/php-fpm.d/www.conf
fi fi
if [ "$PHP82" = "true" ]; then if [ "$PHP82" = "true" ]; then
sed -i "s|user =.*|user = 0|" /data/php/82/php-fpm.d/www.conf sed -i "s|;user =.*|user = root|" /data/php/82/php-fpm.d/www.conf
sed -i "s|group =.*|group = 0|" /data/php/82/php-fpm.d/www.conf sed -i "s|;group =.*|group = root|" /data/php/82/php-fpm.d/www.conf
fi fi
sed -i "s|#\?user root;|user root;|g" /usr/local/nginx/conf/nginx.conf sed -i "s|#user root;|user root;|g" /usr/local/nginx/conf/nginx.conf
launch.sh launch.sh
fi fi

4
rootfs/usr/local/nginx/conf/nginx.conf
View File

@@ -70,11 +70,11 @@ http {
} }
upstream php81 { upstream php81 {
server unix:/var/run/php81.sock; server unix:/run/php81.sock;
} }
upstream php82 { upstream php82 {
server unix:/var/run/php82.sock; server unix:/run/php82.sock;
} }
# Fancy Index # Fancy Index