From fef92732005661444ee5e7411e2fbe782a53b1bf Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 13 Dec 2022 14:22:25 +0000 Subject: [PATCH] directadmin plugin updates --- root/etc/cont-init.d/50-certbot | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-certbot b/root/etc/cont-init.d/50-certbot index 9b3a8ab..087210c 100644 --- a/root/etc/cont-init.d/50-certbot +++ b/root/etc/cont-init.d/50-certbot @@ -65,6 +65,7 @@ sed -i 's|^certbot_dns_domeneshop:||g' /config/dns-conf/domeneshop.ini sed -i 's|^certbot_dns_inwx:||g' /config/dns-conf/inwx.ini sed -i 's|^certbot_dns_transip:||g' /config/dns-conf/transip.ini sed -i 's|^certbot_plugin_gandi:dns_|dns_gandi_|g' /config/dns-conf/gandi.ini +sed -i 's|^directadmin_|dns_directadmin_|g' /config/dns-conf/directadmin.ini sed -i 's|^dns_cpanel_|cpanel_|g' /config/dns-conf/cpanel.ini # update plugin names in renewal conf @@ -76,6 +77,9 @@ if [[ -f "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" ]] && [[ "${ORIGVA sed -i 's|^certbot_dns_cpanel:||g' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" sed -i 's|^dns_cpanel_|cpanel_|g' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" fi + if [[ "${ORIGDNSPLUGIN}" =~ ^(directadmin)$ ]]; then + sed -i 's|^directadmin_|dns_directadmin_|g' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" + fi if [[ "${ORIGDNSPLUGIN}" =~ ^(domeneshop)$ ]]; then sed -i 's|^certbot_dns_domeneshop:||g' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" fi @@ -258,7 +262,7 @@ if [[ "${VALIDATION}" = "dns" ]]; then PROPAGATIONPARAM="" fi # plugins that use old parameter naming convention - if [[ "${DNSPLUGIN}" =~ ^(cpanel|directadmin)$ ]]; then + if [[ "${DNSPLUGIN}" =~ ^(cpanel)$ ]]; then AUTHENTICATORPARAM="--authenticator ${DNSPLUGIN}" DNSCREDENTIALSPARAM="--${DNSPLUGIN}-credentials ${DNSCREDENTIALFILE}" if [[ -n "${PROPAGATION}" ]]; then PROPAGATIONPARAM="--${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi