diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAction.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAction.xml
index 5fa9e700d..09066d054 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAction.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogAction.xml
@@ -368,12 +368,18 @@
action.acme_vault_prefixtext
- This specifies the prefix path in Vault.
+ This specifies the prefix path in Vault. If you select KV v2 you need to add .../data/... between the secret-mount-path and the path. Example: v1 prefix path: secret/acme, v2 prefix path: secret/data/acme.
+
+
+ action.acme_vault_token
+
+ password
+ This specifies the Vault token to authenticate with.action.acme_vault_kvv2checkbox
- If checked version 2 of the kv store will be used, otherwise version 1.
+ If checked version 2 of the kv store will be used, otherwise version 1. If you use v2 please consider the comment in the field "Vault Prefix".
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/AcmeVault.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/AcmeVault.php
index 7242b58f6..86f59f910 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/AcmeVault.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomation/AcmeVault.php
@@ -45,6 +45,9 @@ class AcmeVault extends Base implements LeAutomationInterface
if ((string)$this->config->acme_vault_kvv2 == 1) {
$this->acme_env['VAULT_KV_V2'] = 1;
}
+ if (!empty((string)$this->config->acme_vault_token)) {
+ $this->acme_env['VAULT_TOKEN'] = (string)$this->config->acme_vault_token;
+ }
$this->acme_args[] = '--deploy-hook vault';
return true;
}
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 d7dd70cca..3bbd0d6ad 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
@@ -1596,6 +1596,11 @@
/^.{1,1024}$/uShould be a string between 1 and 1024 characters.
+
+ N
+ /^.{1,1024}$/u
+ Should be a string between 1 and 1024 characters.
+ 1