Merge branch 'develop-o' into develop

ZoeyVid · Aug 2, 2023 · da025ce · da025ce
2 parents 66bfcf8 + fa851b6
commit da025ce
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 4 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.10.3
+2.10.4
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 	<img src="https://nginxproxymanager.com/github.png">
     <!---
 	<br><br>
-	<img src="https://img.shields.io/badge/version-2.10.3-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.10.4-green.svg?style=for-the-badge">
 	<a href="https://hub.docker.com/r/zoeyvid/nginx-proxy-manager">
 		<img src="https://img.shields.io/docker/stars/zoeyvid/nginx-proxy-manager.svg?style=for-the-badge">
 	</a>

diff --git a/backend/internal/certificate.js b/backend/internal/certificate.js
@@ -831,7 +831,7 @@ const internalCertificate = {
 		const credentialsLocation = '/data/tls/certbot/credentials/credentials-' + certificate.id;
 		// Escape single quotes and backslashes
 		const escapedCredentials = certificate.meta.dns_provider_credentials.replaceAll('\'', '\\\'').replaceAll('\\', '\\\\');
-		const credentialsCmd     = 'mkdir -p /data/tls/certbot/credentials 2> /dev/null; echo \'' + escapedCredentials + '\' > \'' + credentialsLocation + '\' && chmod 600 \'' + credentialsLocation + '\'';
+		const credentialsCmd     = `echo '${escapedCredentials}' | tee '${credentialsLocation}'`;
 		const prepareCmd         = 'pip install --no-cache-dir ' + dns_plugin.package_name;
 
 		// Whether the plugin has a --<name>-credentials argument

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

diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json
@@ -60,7 +60,7 @@
     },
     "footer": {
       "fork-me": "Repository on GitHub",
-      "copy": "&copy; 2022 <a href=\"{url}\" target=\"_blank\">jc21.com</a>",
+      "copy": "&copy; 2023 <a href=\"{url}\" target=\"_blank\">jc21.com</a>",
       "copyzv": "and 2023 <a href=\"{url}\" target=\"_blank\">ZoeyVid</a> MIT-License.",
       "theme": "Theme by <a href=\"{url}\" target=\"_blank\">Tabler v0.0.31</a>"
     },

diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js
@@ -58,6 +58,16 @@ dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf274462
 		full_plugin_name: 'dns-azure',
 	},
 	//####################################################//
+	bunny: {
+		display_name:        'bunny.net',
+		package_name:        'certbot-dns-bunny',
+		version_requirement: '~=0.0.9',
+		dependencies:        '',
+		credentials:         `# Bunny API token used by Certbot (see https://dash.bunny.net/account/settings)
+dns_bunny_api_key = xxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx`,
+		full_plugin_name: 'dns-bunny',
+	},
+	//####################################################//
 	cloudflare: {
 		display_name:        'Cloudflare',
 		package_name:        'certbot-dns-cloudflare',
@@ -430,6 +440,19 @@ aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY`,
 		full_plugin_name: 'dns-route53',
 	},
 	//####################################################//
+	strato: {
+		display_name:        'Strato',
+		package_name:        'certbot-dns-strato',
+		version_requirement: '~=0.1.1',
+		dependencies:        '',
+		credentials:         `dns_strato_username = user
+dns_strato_password = pass
+# uncomment if domain name contains special characters
+# insert domain display name as seen on your account page here
+# dns_strato_domain_display_name = my-punicode-url.de`,
+		full_plugin_name: 'dns-strato',
+	},
+	//####################################################//
 	transip: {
 		display_name:        'TransIP',
 		package_name:        'certbot-dns-transip',