merge upstream

Signed-off-by: Zoey <[email protected]>

README.md

@@ -20,9 +20,9 @@ running at home or otherwise, including free TLS, without having to know too muc
 - [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: NO armv7 support
-## 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: 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.** <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.** <br>
 
 
 ## Project Goal

backend/templates/default.conf

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

rootfs/bin/start.sh

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