From fe092d785fcedc25b1f8e5c25f5dcd758c65b811 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 8 Aug 2021 18:52:14 +0200 Subject: [PATCH] security/acme-client: finishing touches for version 3.0 --- .../controllers/OPNsense/AcmeClient/forms/settings.xml | 2 +- .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml | 2 +- .../mvc/app/views/OPNsense/AcmeClient/certificates.volt | 9 +++------ .../mvc/app/views/OPNsense/AcmeClient/settings.volt | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml index 285b55c7f..4089801a0 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml @@ -27,7 +27,7 @@ acmeclient.settings.showIntro checkbox - + acmeclient.settings.challengePort diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml index a2f097ede..47d3ba221 100644 --- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml +++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml @@ -1034,7 +1034,7 @@ Restart Nginx (OPNsense plugin) Upload certificate to Highwinds CDN Upload certificate via SFTP - System or Plugin Command (select below) + System or Plugin Command 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 033529557..334e7914b 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 @@ -448,7 +448,7 @@ POSSIBILITY OF SUCH DAMAGE.
  • {{ lang._('Certificates are stored in the %sOPNsense certificate storage%s. When a CA has completed the validation of a certificate request, the resulting certificate is then automatically imported into the OPNsense certificate storage. The same applies when renewing certificates, the existing entry in the OPNsense certificate storage will automatically be updated.') | format('', '') }}
  • {{ lang._('When removing a certificate from the plugin, the certificate in the %sOPNsense certificate storage%s is %sNOT removed%s, because it may still be used by a core application or another plugin. Obsolete certificates should be manually removed from the OPNsense certificate storage. Note that when creating a new certificate with the same name, a new certificated will be imported into the OPNsense certificate storage (instead of updating the existing entry).') | format('', '', '', '') }}
    • -

    {{ lang._('When experiencing issues, try setting the log level to "debug" in %ssettings%s.') | format('', '') }}

    +

    {{ lang._('When experiencing issues, try setting the log level to "debug" on the %ssettings%s page.') | format('', '') }}

    @@ -481,12 +481,9 @@ POSSIBILITY OF SUCH DAMAGE.
    - + +

    -
    -
    - {{ lang._('Use the Issue/Renew button to let the acme client automatically issue any new certificate and renew existing certificates (only if required). If you want to only issue/renew or revoke a single certificate, use the buttons in the Commands column. This will forcefully issue/renew the certificate, even if it is not required.') }} {{ lang._('The process may take some time and thus will run in the background, you will not get any notification in the GUI. Use the log file to monitor the progress and to see error messages.') }} -

    diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/settings.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/settings.volt index 539fc9738..fb111608b 100644 --- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/settings.volt +++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/settings.volt @@ -259,7 +259,7 @@ POSSIBILITY OF SUCH DAMAGE.

    {{ lang._("Setting up this plugin for the first time involves the following steps") }}

      -
    • {{ lang._('%sEnable%s the plugin: When enabling this plugin in the %ssettings%s, a lightweight service is started and cron jobs are added for automatic tasks.') | format('', '', '', '') }}
      • +
    • {{ lang._('%sEnable%s the plugin: When enabling this plugin on the %ssettings%s page, a lightweight service is started and a cron job is added to run periodic tasks.') | format('', '', '', '') }}
    • {{ lang._('Create an %saccount%s: An %saccount%s is required. It determines which CA will be used for all associated certificates.') | format('', '', '', '') }}
    • {{ lang._('Set up a %schallenge type%s: Choose the %schallenge type%s that works best for you and if necessary, add the credentials for your DNS provider.') | format('', '', '', '') }}
    • {{ lang._('Add %sautomations%s: This is optional, but recommended when using short-lived certificates. %sAutomations%s allow to automatically run tasks when a certificate was created or renewed.') | format('', '', '', '') }}