security/acme-client: post-merge fixes for #4824

This commit is contained in:
Frank Wall 2025-11-30 23:05:33 +01:00
parent 0d641df774
commit bfd90d27f7
3 changed files with 10 additions and 7 deletions

View File

@ -1230,7 +1230,7 @@
<type>text</type>
</field>
<field>
<label>selectel</label>
<label>Selectel</label>
<type>header</type>
<style>table_dns table_dns_selectel</style>
</field>
@ -1242,8 +1242,7 @@
<field>
<id>validation.dns_sl_apiver</id>
<label>API Version</label>
<type>text</type>
<help>Available Values: V2</help>
<type>dropdown</type>
</field>
<field>
<id>validation.dns_sl_token_lifetime</id>
@ -1255,7 +1254,7 @@
<id>validation.dns_sl_account_id</id>
<label>Account ID</label>
<type>text</type>
<help>Account number, can be seen in the upper right corner on the provider's website</help>
<help>The account number can be found on the Selectel control panel</help>
</field>
<field>
<id>validation.dns_sl_project_name</id>
@ -1266,7 +1265,7 @@
<id>validation.dns_sl_login_name</id>
<label>Service username</label>
<type>text</type>
<help>Service username, can be seen in the control panel</help>
<help>The service username can be found in the Selectel control panel</help>
</field>
<field>
<id>validation.dns_sl_password</id>

View File

@ -42,7 +42,7 @@ class DnsSelectel extends Base implements LeValidationInterface
{
$this->acme_env['SL_Key'] = (string)$this->config->dns_sl_key;
$this->acme_env['SL_Ver'] = (string)$this->config->dns_sl_apiver;
$this->acme_env['SL_Expire'] = (string)$this->config->dns_slv2_token_lifetime;
$this->acme_env['SL_Expire'] = (string)$this->config->dns_sl_token_lifetime;
$this->acme_env['SL_Login_ID'] = (string)$this->config->dns_sl_account_id;
$this->acme_env['SL_Project_Name'] = (string)$this->config->dns_sl_project_name;
$this->acme_env['SL_Login_Name'] = (string)$this->config->dns_sl_login_name;

View File

@ -1056,8 +1056,12 @@
<dns_sl_key type="TextField">
<Required>N</Required>
</dns_sl_key>
<dns_sl_apiver type="TextField">
<dns_sl_apiver type="OptionField">
<Required>N</Required>
<OptionValues>
<v1>API version 1 (deprecated)</v1>
<v2>API version 2</v2>
</OptionValues>
</dns_sl_apiver>
<dns_sl_token_lifetime type="TextField">
<Required>N</Required>