ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-06-18 10:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
EDIflyer
2024-06-10 20:10:42 +01:00
committed by GitHub
parent 2e528348b7 d3a654b546
commit 2d65d672c8
123 changed files with 4504 additions and 14066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/rootfs/etc/logrotate.d/nginx-proxy-manager
View File

@ -1,5 +1,6 @@
/data/logs/*_access.log /data/logs/*/access.log {
create 0644 root root
su npm npm
create 0644
weekly
rotate 4
missingok
@ -12,7 +13,8 @@
}
/data/logs/*_error.log /data/logs/*/error.log {
create 0644 root root
su npm npm
create 0644
weekly
rotate 10
missingok

13
docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
View File

@ -1,9 +1,12 @@
# Since force-ssl.conf has now moved to the server section it overrides
# the LetsEncrypt config which is inside a location section
# Set FORCE variable in first two if tests pass and action in the third
set $FORCE "";
set $test "";
if ($scheme = "http") {
set $FORCE 'H';
set $test "H";
}
if ($request_uri ~ "^\/\.well-known\/acme-challenge\/(.*)" {
set $test "${test}T";
}
if ($test = H) {
return 301 https://$host$request_uri;
}
if ($request_uri !~ "^\/\.well-known\/acme-challenge\/(.*)") {
set $FORCE "${FORCE}D";

2
docker/rootfs/etc/s6-overlay/s6-rc.d/backend/run
View File

@ -3,7 +3,7 @@
set -e
. /bin/common.sh
. /usr/bin/common.sh
cd /app || exit 1

2
docker/rootfs/etc/s6-overlay/s6-rc.d/frontend/run
View File

@ -6,7 +6,7 @@ set -e
# This service is DEVELOPMENT only.
if [ "$DEVELOPMENT" = 'true' ]; then
. /bin/common.sh
. /usr/bin/common.sh
cd /app/frontend || exit 1
HOME=$NPMHOME
export HOME

2
docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
View File

@ -3,7 +3,7 @@
set -e
. /bin/common.sh
. /usr/bin/common.sh
log_info 'Starting nginx ...'
exec s6-setuidgid "$PUID:$PGID" nginx

2
docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/00-all.sh
View File

@ -3,7 +3,7 @@
set -e
. /bin/common.sh
. /usr/bin/common.sh
if [ "$(id -u)" != "0" ]; then
log_fatal "This docker container must be run as root, do not specify a user.\nYou can specify PUID and PGID env vars to run processes as that user and group after initialization."

3
docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh
View File

@ -24,4 +24,5 @@ chown -R "$PUID:$PGID" /etc/nginx/nginx.conf
chown -R "$PUID:$PGID" /etc/nginx/conf.d
# Prevents errors when installing python certbot plugins when non-root
chown -R "$PUID:$PGID" /opt/certbot
chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin
find /opt/certbot/lib/python*/site-packages -not -user "$PUID" -execdir chown "$PUID:$PGID" {} \+

0
docker/rootfs/bin/check-health → docker/rootfs/usr/bin/check-health
View File

4
docker/rootfs/bin/common.sh → docker/rootfs/usr/bin/common.sh
View File

@ -12,6 +12,10 @@ export CYAN BLUE YELLOW RED RESET
PUID=${PUID:-0}
PGID=${PGID:-0}
# If changing the username and group name below,
# ensure all references to this user is also changed.
# See docker/rootfs/etc/logrotate.d/nginx-proxy-manager
# and docker/rootfs/etc/nginx/nginx.conf
NPMUSER=npm
NPMGROUP=npm
NPMHOME=/tmp/npmuserhome