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

dep updates/fix #696

Browse Source
This commit is contained in:
renovate[bot]
2024-03-10 04:01:07 +00:00
committed by Zoey
parent d91c4593c3
commit 9d0574edb7
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -62,7 +62,7 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
ARG CRS_VER=v4.0.0 ARG CRS_VER=v4.0.0
COPY rootfs / COPY rootfs /
COPY --from=zoeyvid/certbot-docker:25 /usr/local /usr/local COPY --from=zoeyvid/certbot-docker:26 /usr/local /usr/local
COPY --from=zoeyvid/curl-quic:373 /usr/local/bin/curl /usr/local/bin/curl COPY --from=zoeyvid/curl-quic:373 /usr/local/bin/curl /usr/local/bin/curl
RUN apk upgrade --no-cache -a && \ RUN apk upgrade --no-cache -a && \

6
backend/internal/host.js
View File

@@ -21,17 +21,13 @@ const internalHost = {
if (!combined_data.certificate_id) { if (!combined_data.certificate_id) {
combined_data.ssl_forced = false; combined_data.ssl_forced = false;
combined_data.http2_support = false; combined_data.hsts_subdomains = false;
} }
if (!combined_data.ssl_forced) { if (!combined_data.ssl_forced) {
combined_data.hsts_enabled = false; combined_data.hsts_enabled = false;
} }
if (!combined_data.hsts_enabled) {
combined_data.hsts_subdomains = false;
}
return combined_data; return combined_data;
}, },

2
backend/package.json
View File

@@ -6,7 +6,7 @@
"dependencies": { "dependencies": {
"@apidevtools/json-schema-ref-parser": "11.5.4", "@apidevtools/json-schema-ref-parser": "11.5.4",
"ajv": "6.12.6", "ajv": "6.12.6",
"archiver": "7.0.0", "archiver": "7.0.1",
"batchflow": "0.4.0", "batchflow": "0.4.0",
"bcrypt": "5.1.1", "bcrypt": "5.1.1",
"body-parser": "1.20.2", "body-parser": "1.20.2",

18
rootfs/usr/local/bin/start.sh
View File

@@ -845,9 +845,11 @@ nginxbeautifier -s 4 -r /data/nginx
rm -vf /usr/local/nginx/logs/nginx.pid rm -vf /usr/local/nginx/logs/nginx.pid
rm -vf /run/*.sock rm -vf /run/*.sock
chmod -R 770 /data/tls \ find /data/tls \
/data/etc/npm \ /data/etc/npm \
/data/etc/access /data/etc/access \
-not -perm 770 \
-exec chmod 770 {} \;
if [ "$PUID" != "0" ]; then if [ "$PUID" != "0" ]; then
if id -u npm > /dev/null 2>&1; then if id -u npm > /dev/null 2>&1; then
@@ -870,10 +872,12 @@ if [ "$PUID" != "0" ]; then
echo "ERROR: Unable to set group against the user properly" echo "ERROR: Unable to set group against the user properly"
sleep inf sleep inf
fi fi
chown -R "$PUID:$PGID" /usr/local \ find /usr/local \
/data \ /data \
/run \ /run \
/tmp /tmp \
-not -user "$PUID" -or -not -group "$PGID" \
-exec chown "$PUID:$PGID" {} \;
if [ "$PHP81" = "true" ]; then if [ "$PHP81" = "true" ]; then
sed -i "s|user =.*|;user = root|" /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 = root|" /data/php/81/php-fpm.d/www.conf sed -i "s|group =.*|;group = root|" /data/php/81/php-fpm.d/www.conf
@@ -889,10 +893,12 @@ if [ "$PUID" != "0" ]; then
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
exec sudo -Eu npm launch.sh exec sudo -Eu npm launch.sh
else else
chown -R 0:0 /usr/local \ find /usr/local \
/data \ /data \
/run \ /run \
/tmp /tmp \
-not -user 0 -or -not -group 0 \
-exec chown 0:0 {} \;
if [ "$PHP81" = "true" ]; then if [ "$PHP81" = "true" ]; then
sed -i "s|;user =.*|user = root|" /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 = root|" /data/php/81/php-fpm.d/www.conf sed -i "s|;group =.*|group = root|" /data/php/81/php-fpm.d/www.conf