From 078257cdb3daff37bdad9b94cd26c9914640aaf3 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 22 Nov 2020 00:03:40 +0100 Subject: [PATCH 1/3] security/acme-client: fix creation of nsupdate secrets file --- security/acme-client/pkg-descr | 5 +++++ .../library/OPNsense/AcmeClient/LeValidation/DnsNsupdate.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr index 9e90b9e38..788a21e8a 100644 --- a/security/acme-client/pkg-descr +++ b/security/acme-client/pkg-descr @@ -8,6 +8,11 @@ WWW: https://github.com/acmesh-official/acme.sh Plugin Changelog ================ +2.1 + +Fixed: +* fix creation of nsupdate secrets file + 2.0 Added: diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNsupdate.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNsupdate.php index 5fe117e5e..4d6f349d5 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNsupdate.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNsupdate.php @@ -39,9 +39,9 @@ class DnsNsupdate extends Base implements LeValidationInterface { public function prepare() { - $configdir = (string)sprintf(self::ACME_CONFIG_DIR, $this->cert_uuid); + $configdir = (string)sprintf(self::ACME_CONFIG_DIR, $this->cert_id); $secret_key_filename = "${configdir}/secret.key"; - $secret_key_data = (string)$this->config->dns_nsupdate_key . '\n'; + $secret_key_data = (string)$this->config->dns_nsupdate_key . "\n"; file_put_contents($secret_key_filename, $secret_key_data); // Add env variables From 12a34717ea445b15ef0ab3cf565e25e7d9e21ff3 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 22 Nov 2020 00:03:58 +0100 Subject: [PATCH 2/3] security/acme-client: bump version --- security/acme-client/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile index 97a5889df..b38548cc8 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= acme-client -PLUGIN_VERSION= 2.0 +PLUGIN_VERSION= 2.1 PLUGIN_COMMENT= Let's Encrypt client PLUGIN_MAINTAINER= opnsense@moov.de PLUGIN_DEPENDS= acme.sh py${PLUGIN_PYTHON}-dns-lexicon From db1d677bbe8b455cd43082367b29ac7e7f294f32 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 22 Nov 2020 00:49:24 +0100 Subject: [PATCH 3/3] security/acme-client: fix typo, improve wording --- security/acme-client/pkg-descr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr index 788a21e8a..2593a7e78 100644 --- a/security/acme-client/pkg-descr +++ b/security/acme-client/pkg-descr @@ -23,13 +23,13 @@ Added: * add plugin changelog Fixed: -* fix bug where configuration could get lost (#1526) +* fix bug where configuration changes could get lost (#1526) * fix Cyon DNS API (password not set) Changed: * now an Automation may run multiple times during bulk issue/renewal (previously only once) * rename "Validation Methods" to "Challenge Types" to adopt official LE wording -* rename Menu entry "Automation" to "Automations" +* rename menu entry "Automation" to "Automations" * specify python version for gcloud SDK * rephrase several log messages * add more detailed output when debug logging is enabled