Updated Nginx Proxy Manager to version 2.11.3.

Author: jlesage

Dockerfile

@@ -9,7 +9,7 @@ ARG DOCKER_IMAGE_VERSION=
 
 # Define software versions.
 ARG OPENRESTY_VERSION=1.19.9.1
-ARG NGINX_PROXY_MANAGER_VERSION=2.10.4
+ARG NGINX_PROXY_MANAGER_VERSION=2.11.3
 ARG NGINX_HTTP_GEOIP2_MODULE_VERSION=3.3
 ARG LIBMAXMINDDB_VERSION=1.5.0
 ARG BCRYPT_TOOL_VERSION=1.1.2

src/nginx-proxy-manager/build.sh

@@ -74,11 +74,14 @@ sed -i "s/\"version\": \"0.0.0\",/\"version\": \"${NGINX_PROXY_MANAGER_VERSION}\
 sed -i "s/\"version\": \"0.0.0\",/\"version\": \"${NGINX_PROXY_MANAGER_VERSION}\",/" /tmp/nginx-proxy-manager/backend/package.json
 
 log "Patching Nginx Proxy Manager backend..."
-patch -p1 -d /tmp/nginx-proxy-manager < "$SCRIPT_DIR"/pip-install.patch
-patch -p1 -d /tmp/nginx-proxy-manager < "$SCRIPT_DIR"/remove-certbot-dns-oci.patch
-patch -p1 -d /tmp/nginx-proxy-manager < "$SCRIPT_DIR"/powerdns-fix.patch
-patch -p1 -d /tmp/nginx-proxy-manager < "$SCRIPT_DIR"/http2-support-fix.patch
-patch -p1 -d /tmp/nginx-proxy-manager < "$SCRIPT_DIR"/reachability-test-fix.patch
+PATCHES="
+    pip-install.patch
+    remove-certbot-dns-oci.patch
+"
+for P in $PATCHES; do
+    echo "Applying $P..."
+    patch -p1 -d /tmp/nginx-proxy-manager < "$SCRIPT_DIR"/"$P"
+done
 
 cp -r /tmp/nginx-proxy-manager /app
 
@@ -166,7 +169,7 @@ sed -i 's|user npm;|#user npm;|' $ROOTFS/etc/nginx/nginx.conf
 sed -i 's|/tmp/nginx/body|/var/tmp/nginx/body|' $ROOTFS/etc/nginx/nginx.conf
 
 # Fix the logrotate config.
-sed -i 's|root root|app app|' $ROOTFS/etc/logrotate.d/nginx-proxy-manager
+sed -i 's|npm npm|app app|' $ROOTFS/etc/logrotate.d/nginx-proxy-manager
 sed -i 's|/run/nginx.pid|/run/nginx/nginx.pid|' $ROOTFS/etc/logrotate.d/nginx-proxy-manager
 sed -i 's|logrotate /etc/logrotate.d/nginx-proxy-manager|logrotate -s /config/logrotate.status /etc/logrotate.d/nginx-proxy-manager|' $ROOTFS/opt/nginx-proxy-manager/setup.js
 sed -i 's|/data/logs/\*/access.log|/data/logs/access.log|' $ROOTFS/etc/logrotate.d/nginx-proxy-manager

src/nginx-proxy-manager/http2-support-fix.patch

@@ -1,26 +1,11 @@
-diff --git a/backend/internal/certificate.js b/backend/internal/certificate.js
-index da104a2..730d826 100644
---- a/backend/internal/certificate.js
-+++ b/backend/internal/certificate.js
-@@ -871,7 +871,7 @@ const internalCertificate = {
- 		const escapedCredentials = certificate.meta.dns_provider_credentials.replaceAll('\'', '\\\'').replaceAll('\\', '\\\\');
- 		const credentialsCmd     = 'mkdir -p /etc/letsencrypt/credentials 2> /dev/null; echo \'' + escapedCredentials + '\' > \'' + credentialsLocation + '\' && chmod 600 \'' + credentialsLocation + '\'';
- 		// we call `. /opt/certbot/bin/activate` (`.` is alternative to `source` in dash) to access certbot venv
--		const prepareCmd = '. /opt/certbot/bin/activate && pip install --no-cache-dir ' + dns_plugin.package_name + (dns_plugin.version_requirement || '') + ' ' + dns_plugin.dependencies + ' && deactivate';
-+		const prepareCmd = 'pip install --no-cache-dir ' + dns_plugin.package_name + (dns_plugin.version_requirement || '') + ' ' + dns_plugin.dependencies;
- 
- 		// Whether the plugin has a --<name>-credentials argument
- 		const hasConfigArg = certificate.meta.dns_provider !== 'route53';
-diff --git a/backend/setup.js b/backend/setup.js
-index a4b51c9..6d3d3e3 100644
---- a/backend/setup.js
-+++ b/backend/setup.js
-@@ -189,7 +189,7 @@ const setupCertbotPlugins = () => {
- 				});
- 
- 				if (plugins.length) {
--					const install_cmd = '. /opt/certbot/bin/activate && pip install --no-cache-dir ' + plugins.join(' ') + ' && deactivate';
-+					const install_cmd = 'pip install --no-cache-dir ' + plugins.join(' ');
- 					promises.push(utils.exec(install_cmd));
- 				}
+--- a/backend/lib/certbot.js
++++ b/backend/lib/certbot.js
+@@ -63,7 +63,7 @@
+ 		plugin.version      = plugin.version.replace(/{{certbot-version}}/g, CERTBOT_VERSION_REPLACEMENT);
+ 		plugin.dependencies = plugin.dependencies.replace(/{{certbot-version}}/g, CERTBOT_VERSION_REPLACEMENT);
 
+-		const cmd = '. /opt/certbot/bin/activate && pip install --no-cache-dir ' + plugin.dependencies + ' ' + plugin.package_name + plugin.version + ' ' + ' && deactivate';
++		const cmd = 'pip install --no-cache-dir ' + plugin.dependencies + ' ' + plugin.package_name + plugin.version;
+ 		return utils.exec(cmd)
+ 			.then((result) => {
+ 				logger.complete(`Installed ${pluginKey}`);

src/nginx-proxy-manager/pip-install.patch

@@ -1,25 +1,19 @@
 Because of the Oracle Cloud Infrastructure DNS plugin dependencies, installing
 it causes certbot to be downgraded, which then break any execution of certbot.
---- a/global/certbot-dns-plugins.js
-+++ b/global/certbot-dns-plugins.js
-@@ -437,20 +437,6 @@ dns_netcup_api_password = abcdef0123456789abcdef01234567abcdef0123`,
- 		full_plugin_name:    'dns-nsone',
+--- a/global/certbot-dns-plugins.json
++++ b/global/certbot-dns-plugins.json
+@@ -437,14 +437,6 @@
+ 		"credentials": "dns_nsone_api_key = MDAwMDAwMDAwMDAwMDAw",
+ 		"full_plugin_name": "dns-nsone"
  	},
- 	//####################################################//
--	oci: {
--		display_name:    'Oracle Cloud Infrastructure DNS',
--		package_name:    'certbot-dns-oci',
--		package_version: '0.3.6',
--		dependencies:    'oci',
--		credentials:     `[DEFAULT]
--user = ocid1.user.oc1...
--fingerprint = xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx
--tenancy = ocid1.tenancy.oc1...
--region = us-ashburn-1
--key_file = ~/.oci/oci_api_key.pem`,
--		full_plugin_name: 'dns-oci',
+-	"oci": {
+-		"name": "Oracle Cloud Infrastructure DNS",
+-		"package_name": "certbot-dns-oci",
+-		"version": "~=0.3.6",
+-		"dependencies": "oci",
+-		"credentials": "[DEFAULT]\nuser = ocid1.user.oc1...\nfingerprint = xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx\ntenancy = ocid1.tenancy.oc1...\nregion = us-ashburn-1\nkey_file = ~/.oci/oci_api_key.pem",
+-		"full_plugin_name": "dns-oci"
 -	},
--	//####################################################//
- 	online: {
- 		display_name:        'Online',
- 		package_name:        'certbot-dns-online',
+ 	"ovh": {
+ 		"name": "OVH",
+ 		"package_name": "certbot-dns-ovh",