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

move 'enable http/2' setting from froxlor-vhost-settings to webserver-settings, fixes #575

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-09-26 13:29:30 +02:00
parent 095e54d88d
commit 108c4c25b3
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
actions/admin/settings/122.froxlorvhost.php
View File

@@ -80,19 +80,6 @@ return array(
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'visible' => Settings::Get('system.use_ssl') 'visible' => Settings::Get('system.use_ssl')
), ),
'system_http2_support' => array(
'label' => $lng['serversettings']['http2_support'],
'settinggroup' => 'system',
'varname' => 'http2_support',
'type' => 'bool',
'default' => false,
'save_method' => 'storeSettingField',
'websrv_avail' => array(
'apache2',
'nginx'
),
'visible' => Settings::Get('system.use_ssl')
),
/** /**
* FCGID * FCGID
*/ */

13
actions/admin/settings/130.webserver.php
View File

@@ -60,6 +60,19 @@ return array(
'apache2' 'apache2'
) )
), ),
'system_http2_support' => array(
'label' => $lng['serversettings']['http2_support'],
'settinggroup' => 'system',
'varname' => 'http2_support',
'type' => 'bool',
'default' => false,
'save_method' => 'storeSettingField',
'websrv_avail' => array(
'apache2',
'nginx'
),
'visible' => Settings::Get('system.use_ssl')
),
'system_httpuser' => array( 'system_httpuser' => array(
'label' => $lng['admin']['webserver_user'], 'label' => $lng['admin']['webserver_user'],
'settinggroup' => 'system', 'settinggroup' => 'system',