mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2025-08-03 16:03:38 +00:00
Merge branch 'develop-o' into develop
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
<img src="https://nginxproxymanager.com/github.png">
|
<img src="https://nginxproxymanager.com/github.png">
|
||||||
<!---
|
<!---
|
||||||
<br><br>
|
<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">
|
<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">
|
<img src="https://img.shields.io/docker/stars/zoeyvid/nginx-proxy-manager.svg?style=for-the-badge">
|
||||||
</a>
|
</a>
|
||||||
|
@@ -831,7 +831,7 @@ const internalCertificate = {
|
|||||||
const credentialsLocation = '/data/tls/certbot/credentials/credentials-' + certificate.id;
|
const credentialsLocation = '/data/tls/certbot/credentials/credentials-' + certificate.id;
|
||||||
// Escape single quotes and backslashes
|
// Escape single quotes and backslashes
|
||||||
const escapedCredentials = certificate.meta.dns_provider_credentials.replaceAll('\'', '\\\'').replaceAll('\\', '\\\\');
|
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;
|
const prepareCmd = 'pip install --no-cache-dir ' + dns_plugin.package_name;
|
||||||
|
|
||||||
// Whether the plugin has a --<name>-credentials argument
|
// Whether the plugin has a --<name>-credentials argument
|
||||||
|
@@ -35,6 +35,12 @@ 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;
|
||||||
|
@@ -60,7 +60,7 @@
|
|||||||
},
|
},
|
||||||
"footer": {
|
"footer": {
|
||||||
"fork-me": "Repository on GitHub",
|
"fork-me": "Repository on GitHub",
|
||||||
"copy": "© 2022 <a href=\"{url}\" target=\"_blank\">jc21.com</a>",
|
"copy": "© 2023 <a href=\"{url}\" target=\"_blank\">jc21.com</a>",
|
||||||
"copyzv": "and 2023 <a href=\"{url}\" target=\"_blank\">ZoeyVid</a> MIT-License.",
|
"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>"
|
"theme": "Theme by <a href=\"{url}\" target=\"_blank\">Tabler v0.0.31</a>"
|
||||||
},
|
},
|
||||||
|
@@ -58,6 +58,16 @@ dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf274462
|
|||||||
full_plugin_name: 'dns-azure',
|
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: {
|
cloudflare: {
|
||||||
display_name: 'Cloudflare',
|
display_name: 'Cloudflare',
|
||||||
package_name: 'certbot-dns-cloudflare',
|
package_name: 'certbot-dns-cloudflare',
|
||||||
@@ -430,6 +440,19 @@ aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY`,
|
|||||||
full_plugin_name: 'dns-route53',
|
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: {
|
transip: {
|
||||||
display_name: 'TransIP',
|
display_name: 'TransIP',
|
||||||
package_name: 'certbot-dns-transip',
|
package_name: 'certbot-dns-transip',
|
||||||
|
Reference in New Issue
Block a user