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

Merge branch 'master' of ssh://github.com/opnsense/core

Browse Source
This commit is contained in:
Ad Schellevis 2015-06-11 16:43:09 +02:00
commit 1e8b70bbee
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/etc/inc/system.inc
View File

@ -740,12 +740,6 @@ EOD;
$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
}
if (isset($syslogcfg['zmqserver'])) {
$syslogconf .= <<<EOD
*.* ^{$syslogcfg['zmqserver']}
EOD;
}
/* write syslog.conf */
if (!@file_put_contents("/var/etc/syslog.conf", $syslogconf)) {
printf(gettext("Error: cannot open syslog.conf in system_syslogd_start().%s"), "\n");

2
src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
View File

@ -96,9 +96,9 @@ POSSIBILITY OF SUCH DAMAGE.
ajaxCall('/api/core/firmware/upgrade',{upgrade:$.upgrade_action},function() {
$("#upgrade_progress").removeClass("fa fa-spinner fa-pulse");
$('#updatelist').empty();
setTimeout(trackStatus, 1000) ;
});
$('#updatelist').empty();
}
/**