diff --git a/Makefile b/Makefile index 24cbc6f3b..5f7473c65 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,6 @@ CORE_DEPENDS?= ca_root_nss \ strongswan \ sudo \ syslog-ng \ - syslogd \ unbound \ wpa_supplicant \ zip \ diff --git a/plist b/plist index 1d0036d4e..cc10db003 100644 --- a/plist +++ b/plist @@ -979,7 +979,6 @@ /usr/local/opnsense/service/templates/OPNsense/Syslog/sources/001-local.conf /usr/local/opnsense/service/templates/OPNsense/Syslog/syslog-ng-config-events.conf /usr/local/opnsense/service/templates/OPNsense/Syslog/syslog-ng-destinations.conf -/usr/local/opnsense/service/templates/OPNsense/Syslog/syslog-ng-legacy.conf /usr/local/opnsense/service/templates/OPNsense/Syslog/syslog-ng-local.conf /usr/local/opnsense/service/templates/OPNsense/Syslog/syslog-ng-lockout.conf /usr/local/opnsense/service/templates/OPNsense/Syslog/syslog-ng.conf diff --git a/src/etc/config.xml.sample b/src/etc/config.xml.sample index 619150ab1..73f49399a 100644 --- a/src/etc/config.xml.sample +++ b/src/etc/config.xml.sample @@ -306,10 +306,6 @@ public - - 1 - - automatic diff --git a/src/etc/inc/plugins.inc b/src/etc/inc/plugins.inc index 6cd68673c..83a6251fc 100644 --- a/src/etc/inc/plugins.inc +++ b/src/etc/inc/plugins.inc @@ -133,6 +133,10 @@ function plugins_cron() return $jobs; } +/** + * list of known applications for syslog-ng to use + * Only to be used to register syslog-ng custom destinations (facility is program in syslog-ng's context) + */ function plugins_syslog() { $syslogs = array(); diff --git a/src/etc/inc/plugins.inc.d/core.inc b/src/etc/inc/plugins.inc.d/core.inc index 0509607ca..cf6e45d7d 100644 --- a/src/etc/inc/plugins.inc.d/core.inc +++ b/src/etc/inc/plugins.inc.d/core.inc @@ -105,19 +105,6 @@ function core_services() 'name' => 'cron', ); - if (empty($config['syslog']['disable_clog'])) { - $services[] = array( - 'description' => gettext('Legacy Syslog Daemon'), - 'php' => array( - "stop" => array('system_syslogd_stop'), - "start" => array('system_syslogd_start'), - "restart" => array('system_syslogd_start') - ), - 'pidfile' => '/var/run/syslog.pid', - 'name' => 'syslogd', - ); - } - $services[] = array( 'description' => gettext('Syslog-ng Daemon'), 'php' => array( diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index eebd517a5..5941a3066 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -610,99 +610,16 @@ function system_syslogd_start($verbose = false, $restart = false, $async = false } if ($async) { - configd_run('syslog restart'); - - if ($verbose) { - echo "done.\n"; - } - - return; - } - - configd_run('template reload OPNsense/Syslog'); - - if (empty($config['syslog']['disable_clog'])) { - $syslogcfg = config_read_array('syslog'); - - $log_directive = '%'; - $syslogd_extra = ''; - - $syslogconf = ''; - - $syslogconfs = array(); - - foreach (plugins_syslog() as $plugin_name => $plugin_details) { - $syslogconfs[$plugin_name] = $plugin_details; - } - - $separatelogfacilities = array(); - foreach ($syslogconfs as $logTopic => $logConfig) { - $syslogconf .= "!" . implode(',', $logConfig['facility']) . "\n"; - $separatelogfacilities = array_merge($logConfig['facility'], $separatelogfacilities); - if (!isset($syslogcfg['disablelocallogging'])) { - $syslogconf .= "*.* {$log_directive}/var/log/{$logTopic}.log\n"; - } - } - $syslogd_extra .= '-p /var/run/legacy_log -S /var/run/legacy_logpriv -k -s -s '; - - asort($separatelogfacilities); - $facilitylist = implode(',', array_unique($separatelogfacilities)); - $syslogconf .= "!-{$facilitylist}\n"; - if (!isset($syslogcfg['disablelocallogging'])) { - /* XXX non-system local redirects look unused */ - $syslogconf .= << 0)) { - if (!is_numeric($pconfig['logfilesize']) || ($pconfig['logfilesize'] < 5120)) { - $input_errors[] = gettext("Log file size must be a positive integer greater than 5120."); - } - } if (!empty($pconfig['preservelogs']) && (strlen($pconfig['preservelogs']) > 0)) { if (!is_numeric($pconfig['preservelogs'])) { $input_errors[] = gettext("Preserve logs must be a positive integer value."); @@ -93,12 +86,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (empty($config['syslog'])) { $config['syslog'] = array(); } - $config['syslog']['disable_clog'] = !empty($pconfig['disable_clog']); - if (isset($_POST['logfilesize']) && (strlen($pconfig['logfilesize']) > 0)) { - $config['syslog']['logfilesize'] = (int)$pconfig['logfilesize']; - } elseif (isset($config['syslog']['logfilesize'])) { - unset($config['syslog']['logfilesize']); - } if (isset($_POST['preservelogs']) && (strlen($pconfig['preservelogs']) > 0)) { $config['syslog']['preservelogs'] = (int)$pconfig['preservelogs']; } elseif (isset($config['syslog']['preservelogs'])) { @@ -171,17 +158,6 @@ $(document).ready(function() { }] }); }); - - $("#disable_clog").change(function(){ - if ($(this).is(":checked")) { - $("#preservelogs").prop("disabled", false).closest("tr").removeClass("hidden"); - $("#logfilesize").prop("disabled", true).closest("tr").addClass("hidden"); - } else { - $("#preservelogs").prop("disabled", true).closest("tr").addClass("hidden"); - $("#logfilesize").prop("disabled", false).closest("tr").removeClass("hidden"); - } - }); - $("#disable_clog").change(); }); //]]> @@ -212,15 +188,6 @@ $(document).ready(function() { - - - /> - - - - @@ -229,20 +196,6 @@ $(document).ready(function() { - - - - - - -