merge upstream

Signed-off-by: Zoey <zoey@z0ey.de>
This commit is contained in:
Zoey
2023-08-02 10:41:03 +02:00
parent da025cedaa
commit f3775aad21
3 changed files with 5 additions and 10 deletions

View File

@@ -20,9 +20,9 @@ running at home or otherwise, including free TLS, without having to know too muc
- [Screenshots](https://nginxproxymanager.com/screenshots) - [Screenshots](https://nginxproxymanager.com/screenshots)
## Note: To fix [this issue](https://github.com/SpiderLabs/ModSecurity/issues/2848), instead of running `nginx -s reload`, this fork stops nginx and starts it again. This will result in a 502 error when you update your hosts. See https://github.com/ZoeyVid/nginx-proxy-manager/issues/296 and https://github.com/ZoeyVid/nginx-proxy-manager/issues/283. **Note: To fix [this issue](https://github.com/SpiderLabs/ModSecurity/issues/2848), instead of running `nginx -s reload`, this fork stops nginx and starts it again. This will result in a 502 error when you update your hosts. See https://github.com/ZoeyVid/nginx-proxy-manager/issues/296 and https://github.com/ZoeyVid/nginx-proxy-manager/issues/283.** <br>
## Note: NO armv7 support **Note: NO armv7 support.** <br>
## Note: add `net.ipv4.ip_unprivileged_port_start=0` at the end of `/etc/sysctl.conf` to support PUID/PGID in network mode host **Note: add `net.ipv4.ip_unprivileged_port_start=0` at the end of `/etc/sysctl.conf` to support PUID/PGID in network mode host.** <br>
## Project Goal ## Project Goal

View File

@@ -35,12 +35,6 @@ server {
return 444; return 444;
{%- endif %} {%- endif %}
{%- if value == "444" %}
location / {
return 444;
}
{% endif %}
{%- if value == "redirect" %} {%- if value == "redirect" %}
location / { location / {
include conf.d/include/acme-challenge.conf; include conf.d/include/acme-challenge.conf;

View File

@@ -204,7 +204,8 @@ mkdir -p /tmp/acme-challenge \
/tmp/certbot-log \ /tmp/certbot-log \
/tmp/npmhome /tmp/npmhome
mkdir -vp /data/tls/certbot/renewal \ mkdir -vp /data/tls/certbot/credentials \
/data/tls/certbot/renewal \
/data/tls/custom \ /data/tls/custom \
/data/etc/npm \ /data/etc/npm \
/data/etc/html \ /data/etc/html \