Merge pull request #4605 from NginxProxyManager/develop

v2.12.4

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

@@ -27,15 +27,15 @@ chown -R "$PUID:$PGID" /etc/nginx/conf.d
 CERT_INIT_FLAG="/opt/certbot/.ownership_initialized"
 
 if [ ! -f "$CERT_INIT_FLAG" ]; then
-	# Prevents errors when installing python certbot plugins when non-root
+    # Prevents errors when installing python certbot plugins when non-root
-	chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin
+    chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin
 
-	# Handle all site-packages directories efficiently
+    # Handle all site-packages directories efficiently
-	find /opt/certbot/lib -type d -name "site-packages" | while read -r SITE_PACKAGES_DIR; do
+    find /opt/certbot/lib -type d -name "site-packages" | while read -r SITE_PACKAGES_DIR; do
-		chown -R "$PUID:$PGID" "$SITE_PACKAGES_DIR"
+        chown -R "$PUID:$PGID" "$SITE_PACKAGES_DIR"
-	done
+    done
 
-	# Create a flag file to skip this step on subsequent runs
+    # Create a flag file to skip this step on subsequent runs
-	touch "$CERT_INIT_FLAG"
+    touch "$CERT_INIT_FLAG"
-	chown "$PUID:$PGID" "$CERT_INIT_FLAG"
+    chown "$PUID:$PGID" "$CERT_INIT_FLAG"
-fi
+fi

global/certbot-dns-plugins.json

@@ -68,7 +68,7 @@
 		"package_name": "certbot-dns-cloudflare",
 		"version": "=={{certbot-version}}",
 		"dependencies": "cloudflare==4.0.* acme=={{certbot-version}}",
-		"credentials": "# Cloudflare API token\ndns_cloudflare_api_token=0123456789abcdef0123456789abcdef01234567",
+		"credentials": "# Cloudflare API credentials used by Certbot\ndns_cloudflare_email = cloudflare@example.com\ndns_cloudflare_api_key = 0123456789abcdef0123456789abcdef01234",
 		"full_plugin_name": "dns-cloudflare"
 	},
 	"cloudns": {