From 1a41b91414a7580cb9ac03bc5f80aea29259a912 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 3 Aug 2017 15:53:34 +0200 Subject: [PATCH 1/3] security/acme-client: depends on BIND to support nsupdate --- 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 badc3facf..df91f3e27 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -2,6 +2,6 @@ PLUGIN_NAME= acme-client PLUGIN_VERSION= 1.8 PLUGIN_COMMENT= Let's Encrypt client PLUGIN_MAINTAINER= opnsense@moov.de -PLUGIN_DEPENDS= acme.sh +PLUGIN_DEPENDS= acme.sh bind911 .include "../../Mk/plugins.mk" From 9bc93a30203c76ba40c198e8509f5bca052f0076 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 3 Aug 2017 15:56:48 +0200 Subject: [PATCH 2/3] security/acme-client: replace the std dialog, title "Remove" was never fitting --- .../OPNsense/AcmeClient/certificates.volt | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt index 995730d5a..d7ecdc49b 100644 --- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt +++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt @@ -119,6 +119,25 @@ POSSIBILITY OF SUCH DAMAGE. }, }; + /** + * standard dialog when confirmation is required, wrapper around BootstrapDialog + */ + function stdDialogConfirmation(message, callback) { + BootstrapDialog.confirm({ + title: 'Confirmation Required', + message: message, + type:BootstrapDialog.TYPE_DANGER, + btnCancelLabel: 'Cancel', + btnOKLabel: 'Yes', + btnOKClass: 'btn-primary', + callback: function(result) { + if(result) { + callback(); + } + } + }); + } + /** * reload bootgrid, return to current selected page */ @@ -315,7 +334,7 @@ POSSIBILITY OF SUCH DAMAGE. { if (gridParams['sign'] != undefined) { var uuid=$(this).data("row-id"); - stdDialogRemoveItem('Forcefully (re-)issue the selected certificate?',function() { + stdDialogConfirmation('Forcefully (re-)issue the selected certificate?',function() { // Handle HAProxy integration (no-op if not applicable) ajaxCall(url="/api/acmeclient/settings/fetchHAProxyIntegration", sendData={}, callback=function(data,status) { ajaxCall(url=gridParams['sign'] + uuid,sendData={},callback=function(data,status){ @@ -335,7 +354,7 @@ POSSIBILITY OF SUCH DAMAGE. { if (gridParams['revoke'] != undefined) { var uuid=$(this).data("row-id"); - stdDialogRemoveItem('Revoke selected certificate?',function() { + stdDialogConfirmation('Revoke selected certificate?',function() { ajaxCall(url=gridParams['revoke'] + uuid, sendData={},callback=function(data,status){ // reload grid after sign From 2aae4b1a946189d2b7c852320f6d0d536a8da9a7 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 3 Aug 2017 16:01:05 +0200 Subject: [PATCH 3/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 df91f3e27..0ba39a731 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= acme-client -PLUGIN_VERSION= 1.8 +PLUGIN_VERSION= 1.9 PLUGIN_COMMENT= Let's Encrypt client PLUGIN_MAINTAINER= opnsense@moov.de PLUGIN_DEPENDS= acme.sh bind911