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

allow hiding documentation menu for customers via customers-hide-option; use --staging for acme.sh for every test-CA

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-01-18 08:59:59 +01:00
parent 6cbdf45a7c
commit c56bc651b9
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actions/admin/settings/100.panel.php
View File

@@ -269,7 +269,8 @@ return [
'traffic' => lng('menue.traffic.traffic'), 'traffic' => lng('menue.traffic.traffic'),
'traffic.http' => lng('menue.traffic.traffic') . " / HTTP", 'traffic.http' => lng('menue.traffic.traffic') . " / HTTP",
'traffic.ftp' => lng('menue.traffic.traffic') . " / FTP", 'traffic.ftp' => lng('menue.traffic.traffic') . " / FTP",
'traffic.mail' => lng('menue.traffic.traffic') . " / Mail" 'traffic.mail' => lng('menue.traffic.traffic') . " / Mail",
'misc.documentation' => lng('admin.documentation'),
], ],
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'advanced_mode' => true 'advanced_mode' => true

2
lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php
View File

@@ -557,7 +557,7 @@ EOC;
if (Settings::Get('system.letsencryptreuseold') != '1') { if (Settings::Get('system.letsencryptreuseold') != '1') {
$acmesh_cmd .= " --always-force-new-domain-key"; $acmesh_cmd .= " --always-force-new-domain-key";
} }
if (Settings::Get('system.letsencryptca') == 'letsencrypt_test') { if (substr(Settings::Get('system.letsencryptca'), -5) == '_test') {
$acmesh_cmd .= " --staging"; $acmesh_cmd .= " --staging";
} }
if ($force) { if ($force) {

8
lib/config.example.inc.php
View File

@@ -4,5 +4,11 @@
* change the options below to either true or false * change the options below to either true or false
*/ */
return [ return [
'enable_webupdate' => false /**
* enable/disable the possibility to update froxlor from within the web-interface,
* recommended value for debian/ubuntu package users is false to rely on apt and not have version mixup.
* This is also useful for providers that manage the servers but give admin access to froxlor to handle
* updates the way the providers does it (e.g. automation, etc.)
*/
'enable_webupdate' => false,
]; ];

1
lib/navigation/00.froxlor.main.php
View File

@@ -158,6 +158,7 @@ return [
'docs' => [ 'docs' => [
'label' => lng('admin.documentation'), 'label' => lng('admin.documentation'),
'icon' => 'fa-solid fa-circle-info', 'icon' => 'fa-solid fa-circle-info',
'show_element' => (!Settings::IsInList('panel.customer_hide_options', 'misc.documentation')),
'elements' => [ 'elements' => [
[ [
'url' => 'https://docs.froxlor.org/v2/user-guide/', 'url' => 'https://docs.froxlor.org/v2/user-guide/',