From 122c90e3244e67033cfa515e333536a3e313c0c4 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 29 Oct 2021 08:01:53 +0200 Subject: [PATCH] plugins: remove obsolete 'remote' keyword --- net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc | 1 - net/relayd/src/etc/inc/plugins.inc.d/relayd.inc | 6 ++++-- security/tinc/src/etc/inc/plugins.inc.d/tinc.inc | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc b/net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc index cfeabbc4d..790965b80 100644 --- a/net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc +++ b/net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc @@ -39,7 +39,6 @@ function haproxy_syslog() $syslogconf['haproxy'] = array( 'local' => '/var/haproxy/var/run/log', 'facility' => array('haproxy'), - 'remote' => 'relayd', ); return $syslogconf; diff --git a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc index 08b2e98b4..1acfd4f3f 100644 --- a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc +++ b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc @@ -83,9 +83,11 @@ function relayd_xmlrpc_sync() function relayd_syslog() { - $logfacilities = array(); + $logfacilities = []; - $logfacilities['relayd'] = array('facility' => array('relayd'), 'remote' => 'relayd'); + $logfacilities['relayd'] = [ + 'facility' => ['relayd'] + ]; return $logfacilities; } diff --git a/security/tinc/src/etc/inc/plugins.inc.d/tinc.inc b/security/tinc/src/etc/inc/plugins.inc.d/tinc.inc index 8d714a4a3..e732ece41 100644 --- a/security/tinc/src/etc/inc/plugins.inc.d/tinc.inc +++ b/security/tinc/src/etc/inc/plugins.inc.d/tinc.inc @@ -41,12 +41,12 @@ function tinc_enabled() function tinc_syslog() { - $logfacilities = array(); + $logfacilities = []; + + $logfacilities['tinc'] = [ + 'facility' => ['tincd'], + ]; - $logfacilities['tinc'] = array( - 'facility' => array('tincd'), - 'remote' => 'vpn', - ); $mdl = new \OPNsense\Tinc\Tinc(); foreach ($mdl->networks->network->iterateItems() as $network) {