From e0a11f707be1bde7c5424c8db2ff94979414e8e1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 13 Jun 2016 20:05:27 +0200
Subject: [PATCH] net: plugin proper remote log settings

---
 net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc | 8 +++++++-
 net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc    | 7 ++++++-
 net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc  | 7 ++++++-
 net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc    | 7 ++++++-
 4 files changed, 25 insertions(+), 4 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 2fb7a60cc..62e08edab 100644
--- a/net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc
+++ b/net/haproxy/src/etc/inc/plugins.inc.d/haproxy.inc
@@ -35,7 +35,13 @@
 function haproxy_syslog()
 {
     $syslogconf = array();
-    $syslogconf['haproxy'] = array("facility" => array('haproxy'), "local" => "/var/run/haproxy/var/run/log");
+
+    $syslogconf['haproxy'] = array(
+        'local' => '/var/run/haproxy/var/run/log',
+        'facility' => array('haproxy'),
+        'remote' => 'relayd',
+    );
+
     return $syslogconf;
 }
 
diff --git a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc
index bdc2f8d31..23b805ecf 100644
--- a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc
+++ b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc
@@ -63,7 +63,12 @@ function if_l2tp_services()
 function if_l2tp_syslog()
 {
     $logfacilities = array();
-    $logfacilities['l2tps'] = array('facility' => array('l2tps'));
+
+    $logfacilities['l2tps'] = array(
+        'facility' => array('l2tps'),
+        'remote' => 'vpn',
+    );
+
     return $logfacilities;
 }
 
diff --git a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc
index 09d083e3c..130e73e02 100644
--- a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc
+++ b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc
@@ -70,7 +70,12 @@ function if_pppoe_services()
 function if_pppoe_syslog()
 {
     $logfacilities = array();
-    $logfacilities['poes'] = array('facility' => array('poes'));
+
+    $logfacilities['poes'] = array(
+        'facility' => array('poes'),
+        'remote' => 'vpn',
+    );
+
     return $logfacilities;
 }
 
diff --git a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc
index e0081bc60..3c6e2d589 100644
--- a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc
+++ b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc
@@ -63,7 +63,12 @@ function if_pptp_services()
 function if_pptp_syslog()
 {
     $logfacilities = array();
-    $logfacilities['pptps'] = array('facility' => array('pptps'));
+
+    $logfacilities['pptps'] = array(
+        'facility' => array('pptps'),
+        'remote' => 'vpn',
+    );
+
     return $logfacilities;
 }