maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

enhance information on updater regarding acme-challenge (if lets encrypt is enabled and applicable)

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-01-18 11:47:55 +01:00
parent c56bc651b9
commit 1e013d9e9a
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
install/updates/preconfig/preconfig_2.x.inc.php
View File

@@ -76,7 +76,7 @@ if (Update::versionInUpdate($current_version, '2.0.0-beta1')) {
if (Update::versionInUpdate($current_db_version, '202301120')) {
$acmesh_challenge_dir = rtrim(FileDir::makeCorrectDir(Settings::Get('system.letsencryptchallengepath')), "/");
$recommended = rtrim(FileDir::makeCorrectDir(Froxlor::getInstallDir()), "/");
if ($acmesh_challenge_dir != $recommended) {
if ((int) Settings::Get('system.leenabled') == 1 && $acmesh_challenge_dir != $recommended) {
$has_preconfig = true;
$description = 'ACME challenge docroot from settings differs from the current installation directory.';
$question = '<strong>Validate Let\'s Encrypt challenge path (recommended value: ' . $recommended . ')&nbsp;';
@@ -85,7 +85,8 @@ if (Update::versionInUpdate($current_db_version, '202301120')) {
'value' => $recommended,
'placeholder' => $acmesh_challenge_dir,
'label' => $question,
'prior_infotext' => $description
'prior_infotext' => $description,
'mandatory' => true,
];
}
}