Project

General

Profile

« Previous | Next » 

Revision 586c623a

Added by Jim Pingle over 6 years ago

Deprecate the built-in relayd Load Balancer. Closes #9386

It is not available on FreeBSD 12 with OpenSSL 1.1.x.

Users can migrate to the HAProxy package.

View differences:

src/etc/inc/system.inc
878 878
		}
879 879
	}
880 880

  
881
	$log_files = array("system", "filter", "dhcpd", "vpn", "poes", "l2tps", "openvpn", "portalauth", "ipsec", "ppp", "relayd", "wireless", "nginx", "ntpd", "gateways", "resolver", "routing");
881
	$log_files = array("system", "filter", "dhcpd", "vpn", "poes", "l2tps", "openvpn", "portalauth", "ipsec", "ppp", "wireless", "nginx", "ntpd", "gateways", "resolver", "routing");
882 882
	foreach ($log_files as $lfile) {
883 883
		clear_log_file("{$g['varlog_path']}/{$lfile}.log", false);
884 884
	}
......
924 924

  
925 925
	$syslogd_extra = "";
926 926
	if (isset($syslogcfg)) {
927
		$separatelogfacilities = array('ntp', 'ntpd', 'ntpdate', 'charon', 'ipsec_starter', 'openvpn', 'poes', 'l2tps', 'relayd', 'hostapd', 'dnsmasq', 'named', 'filterdns', 'unbound', 'dhcpd', 'dhcrelay', 'dhclient', 'dhcp6c', 'dpinger', 'radvd', 'routed', 'zebra', 'ospfd', 'ospf6d', 'bgpd', 'miniupnpd', 'filterlog');
927
		$separatelogfacilities = array('ntp', 'ntpd', 'ntpdate', 'charon', 'ipsec_starter', 'openvpn', 'poes', 'l2tps', 'hostapd', 'dnsmasq', 'named', 'filterdns', 'unbound', 'dhcpd', 'dhcrelay', 'dhclient', 'dhcp6c', 'dpinger', 'radvd', 'routed', 'zebra', 'ospfd', 'ospf6d', 'bgpd', 'miniupnpd', 'filterlog');
928 928
		$syslogconf = "";
929 929
		if ($config['installedpackages']['package']) {
930 930
			foreach ($config['installedpackages']['package'] as $package) {
......
1018 1018
			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
1019 1019
		}
1020 1020

  
1021
		$syslogconf .= "!relayd\n";
1022
		if (!isset($syslogcfg['disablelocallogging'])) {
1023
			$syslogconf .= "*.* 								{$log_directive}{$g['varlog_path']}/relayd.log\n";
1024
		}
1025
		if (isset($syslogcfg['relayd'])) {
1026
			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
1027
		}
1028

  
1029 1021
		$syslogconf .= "!hostapd\n";
1030 1022
		if (!isset($syslogcfg['disablelocallogging'])) {
1031 1023
			$syslogconf .= "*.* 								{$log_directive}{$g['varlog_path']}/wireless.log\n";

Also available in: Unified diff