upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3899 from fraenki/acme_420

Browse source 
security/acme-client: release 4.2
This commit is contained in:
Frank Wall 2024-04-08 23:38:12 +02:00 committed by GitHub
commit 520960d435
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/acme-client/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= acme-client
PLUGIN_VERSION= 4.1
PLUGIN_VERSION= 4.2
PLUGIN_COMMENT= ACME Client
PLUGIN_MAINTAINER= opnsense@moov.de
PLUGIN_DEPENDS= acme.sh py${PLUGIN_PYTHON}-dns-lexicon

9
security/acme-client/pkg-descr
View file

@ -8,6 +8,15 @@ WWW: https://github.com/acmesh-official/acme.sh
Plugin Changelog
================
4.2
Added:
* add ArtFiles DNS API (#3866)
* add dnsHome DNS API (#3882)
Fixed:
* fix PHP deprecation messages (#3892)
4.1
Fixed:

4
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php
View file

@ -347,14 +347,14 @@ class SettingsController extends ApiMutableModelControllerBase
// Link to ACME Action is currently missing: add it!
if (!empty((string)$_actions)) {
// Extend existing string.
$_actions .= ",${action_ref}";
$_actions .= ",{$action_ref}";
} else {
// First linked Action for this frontend.
$_actions = $action_ref;
}
// Add modified list of linked Actions to frontend.
$frontend->linkedActions = $_actions;
$this->getLogger()->error("AcmeClient: HAProxy integration: updating frontend ${_frontend}");
$this->getLogger()->error("AcmeClient: HAProxy integration: updating frontend {$_frontend}");
// We need to write changes to config.
$integration_changes = true;
}

12
security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php
View file

@ -44,26 +44,26 @@ class M1_6_0 extends BaseModelMigration
foreach ($model->getNodeByReference('accounts.account')->iterateItems() as $account) {
$account_id = (string)$account->id;
$account_dir = $dir . $account_id;
$new_account_dir = "${dir}${account_id}_${env}";
$new_account_dir = "{$dir}{$account_id}_{$env}";
// Check if account directory exists
// Accounts that haven't been used yet don't need to be migrated.
if (is_dir($account_dir)) {
// Check if account configuration can be found.
$account_file = "${account_dir}/account.conf";
$account_file = "{$account_dir}/account.conf";
if (is_file($account_file)) {
// Parse config file and modify path information
$account_conf = parse_ini_file($account_file);
foreach ($account_conf as $key => $value) {
switch ($key) {
case 'ACCOUNT_KEY_PATH':
$account_conf[$key] = "${new_account_dir}/account.key";
$account_conf[$key] = "{$new_account_dir}/account.key";
break;
case 'ACCOUNT_JSON_PATH':
$account_conf[$key] = "${new_account_dir}/account.json";
$account_conf[$key] = "{$new_account_dir}/account.json";
break;
case 'CA_CONF':
$account_conf[$key] = "${new_account_dir}/ca.conf";
$account_conf[$key] = "{$new_account_dir}/ca.conf";
break;
}
}
@ -71,7 +71,7 @@ class M1_6_0 extends BaseModelMigration
// Convert array back to ini file format
$new_account_conf = array();
foreach ($account_conf as $key => $value) {
$new_account_conf[] = "${key}='${value}'";
$new_account_conf[] = "{$key}='{$value}'";
}
// Write changes back to file

2
security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M4_0_0.php
View file

@ -54,7 +54,7 @@ class M4_0_0 extends BaseModelMigration
// Convert array back to ini file format
$new_account_conf = array();
foreach ($account_conf as $key => $value) {
$new_account_conf[] = "${key}='${value}'";
$new_account_conf[] = "{$key}='{$value}'";
}
// Write changes back to file