lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: fix syslog access for legacy moves

Browse Source 
This reverts commit 022ab7ad75a994eb92d8e923ba904e033c593392.
This commit is contained in:
Franco Fichtner 2024-03-13 09:04:28 +01:00
parent a38b887e29
commit c149ac2cfb
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/www/system_advanced_admin.php
View File

@ -79,7 +79,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['deployment'] = $config['system']['deployment'] ?? '';
/* XXX not really a syslog setting */
$pconfig['loglighttpd'] = empty($config['syslog']) || empty($config['syslog']['nologlighttpd']);
$pconfig['loglighttpd'] = empty($config['syslog']['nologlighttpd']);
/* XXX listtag "fun" */
$pconfig['sshlogingroup'] = !empty($config['system']['ssh']['group'][0]) ? $config['system']['ssh']['group'][0] : null;
@ -152,7 +152,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (count($input_errors) == 0) {
$newinterfaces = !empty($pconfig['webguiinterfaces']) ? implode(',', $pconfig['webguiinterfaces']) : '';
$newciphers = !empty($pconfig['ssl-ciphers']) ? implode(':', $pconfig['ssl-ciphers']) : '';
$syslog_conf = &config_read_array('syslog');
$restart_webgui = $config['system']['webgui']['protocol'] != $pconfig['webguiproto'] ||
($config['system']['webgui']['session_timeout'] ?? '') != $pconfig['session_timeout'] ||
@ -165,7 +164,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
empty($pconfig['ssl-hsts']) != empty($config['system']['webgui']['ssl-hsts']) ||
!empty($pconfig['disablehttpredirect']) != !empty($config['system']['webgui']['disablehttpredirect']) ||
($config['system']['deployment'] ?? '') != $pconfig['deployment'] ||
!empty($syslog_conf['nologlighttpd']) != empty($pconfig['loglighttpd']);
!empty($config['syslog']['nologlighttpd']) != empty($pconfig['loglighttpd']);
$config['system']['webgui']['protocol'] = $pconfig['webguiproto'];
$config['system']['webgui']['port'] = $pconfig['webguiport'];
@ -173,7 +172,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$config['system']['webgui']['ssl-ciphers'] = $newciphers;
$config['system']['webgui']['interfaces'] = $newinterfaces;
$config['system']['webgui']['compression'] = $pconfig['compression'];
$syslog_conf['nologlighttpd'] = empty($pconfig['loglighttpd']);
if (empty($config['system']['syslog'])) {
$config['system']['syslog'] = [];
}
$config['syslog']['nologlighttpd'] = empty($pconfig['loglighttpd']);
if (!empty($pconfig['deployment'])) {
$config['system']['deployment'] = $pconfig['deployment'];

4
src/www/system_advanced_firewall.php
View File

@ -252,6 +252,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$config['system']['keepcounters'] = !empty($pconfig['keepcounters']);
$config['system']['pfdebug'] = !empty($pconfig['pfdebug']) ? $pconfig['pfdebug'] : '';
if (empty($config['system']['syslog'])) {
$config['system']['syslog'] = [];
}
$config['syslog']['nologdefaultblock'] = empty($pconfig['logdefaultblock']);
$config['syslog']['nologdefaultpass'] = empty($pconfig['logdefaultpass']);
$config['syslog']['nologbogons'] = empty($pconfig['logbogons']);