diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 4ad87d41c..3e61d6cc6 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,6 +1,5 @@
PLUGIN_NAME= caddy
-PLUGIN_VERSION= 1.5.5
-PLUGIN_REVISION= 1
+PLUGIN_VERSION= 1.5.6
PLUGIN_DEPENDS= caddy-custom
PLUGIN_COMMENT= Easy to configure Reverse Proxy with Automatic HTTPS and Dynamic DNS
PLUGIN_MAINTAINER= cedrik@pischem.com
diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr
index ea38afb12..c7e00bd68 100644
--- a/www/caddy/pkg-descr
+++ b/www/caddy/pkg-descr
@@ -29,6 +29,7 @@ Plugin Changelog
1.5.6
* Fix: Wildcard domains with activated "Dynamic DNS" update their base domain with * instead of @.
+* Add: DNS Providers: Netcup, RFC2136
1.5.5
diff --git a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml
index 264a7e27c..7f469d4e9 100644
--- a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml
+++ b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dnsprovider.xml
@@ -9,7 +9,7 @@
caddy.general.TlsDnsApiKey
text
-
+
header
@@ -20,19 +20,19 @@
caddy.general.TlsDnsSecretApiKey
text
-
+
caddy.general.TlsDnsOptionalField1
text
-
+
caddy.general.TlsDnsOptionalField2
text
-
+
caddy.general.TlsDnsOptionalField3
diff --git a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
index 4177a5dc5..49e1aa122 100644
--- a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
+++ b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
@@ -46,6 +46,8 @@
Dinahosting
Hexonet
Mail-in-a-Box
+ Netcup
+ RFC2136
diff --git a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
index 76e5a6d27..ca403c57a 100644
--- a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
+++ b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
@@ -143,7 +143,7 @@
{% if dnsProvider and dnsProvider != "acmedns" and dynDnsDomains|length > 0 %}
dynamic_dns {
- {% if dnsProvider in ['porkbun', 'desec', 'route53', 'googleclouddns', 'azure', 'ovh', 'namecheap', 'powerdns', 'ddnss', 'linode', 'tencentcloud', 'dinahosting', 'hexonet', 'mailinabox'] %}
+ {% if dnsProvider in ['porkbun', 'desec', 'route53', 'googleclouddns', 'azure', 'ovh', 'namecheap', 'powerdns', 'ddnss', 'linode', 'tencentcloud', 'dinahosting', 'hexonet', 'mailinabox', 'netcup', 'rfc2136'] %}
provider {{ dnsProvider }} {
{% if dnsProvider == 'porkbun' %}
{% if dnsApiKey %}api_key {{ dnsApiKey }}
@@ -238,6 +238,22 @@
{% endif %}
{% if dnsOptionalField1 %}password {{ dnsOptionalField1 }}
{% endif %}
+ {% elif dnsProvider == 'netcup' %}
+ {% if dnsApiKey %}customer_number {{ dnsApiKey }}
+ {% endif %}
+ {% if dnsSecretApiKey %}api_key {{ dnsSecretApiKey }}
+ {% endif %}
+ {% if dnsOptionalField1 %}api_password {{ dnsOptionalField1 }}
+ {% endif %}
+ {% elif dnsProvider == 'rfc2136' %}
+ {% if dnsApiKey %}key_name {{ dnsApiKey }}
+ {% endif %}
+ {% if dnsSecretApiKey %}key_alg {{ dnsSecretApiKey }}
+ {% endif %}
+ {% if dnsOptionalField1 %}key {{ dnsOptionalField1 }}
+ {% endif %}
+ {% if dnsOptionalField2 %}server {{ dnsOptionalField2 }}
+ {% endif %}
{% endif %}
}
{% else %}
@@ -342,7 +358,7 @@
#}
{% macro tls_configuration(dnsProvider, dnsApiKey, customCert, dnsChallenge, dnsSecretApiKey, TlsDnsOptionalField1, TlsDnsOptionalField2, TlsDnsOptionalField3, TlsDnsOptionalField4) %}
{% if dnsChallenge == "1" and dnsProvider %}
- {% if dnsProvider in ['duckdns', 'porkbun', 'desec', 'route53', 'acmedns', 'googleclouddns', 'azure', 'ovh', 'namecheap', 'powerdns', 'ddnss', 'linode', 'tencentcloud', 'dinahosting', 'hexonet', 'mailinabox'] %}
+ {% if dnsProvider in ['duckdns', 'porkbun', 'desec', 'route53', 'acmedns', 'googleclouddns', 'azure', 'ovh', 'namecheap', 'powerdns', 'ddnss', 'linode', 'tencentcloud', 'dinahosting', 'hexonet', 'mailinabox', 'netcup', 'rfc2136'] %}
tls {
dns {{ dnsProvider }} {
{% if dnsProvider == 'duckdns' %}
@@ -452,6 +468,22 @@
{% endif %}
{% if dnsOptionalField1 %}password {{ dnsOptionalField1 }}
{% endif %}
+ {% elif dnsProvider == 'netcup' %}
+ {% if dnsApiKey %}customer_number {{ dnsApiKey }}
+ {% endif %}
+ {% if dnsSecretApiKey %}api_key {{ dnsSecretApiKey }}
+ {% endif %}
+ {% if dnsOptionalField1 %}api_password {{ dnsOptionalField1 }}
+ {% endif %}
+ {% elif dnsProvider == 'rfc2136' %}
+ {% if dnsApiKey %}key_name {{ dnsApiKey }}
+ {% endif %}
+ {% if dnsSecretApiKey %}key_alg {{ dnsSecretApiKey }}
+ {% endif %}
+ {% if dnsOptionalField1 %}key {{ dnsOptionalField1 }}
+ {% endif %}
+ {% if dnsOptionalField2 %}server {{ dnsOptionalField2 }}
+ {% endif %}
{% endif %}
}
}