From 4cf57934117da5889b12049625a3836f370fd463 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 28 Nov 2019 22:26:40 +0100
Subject: [PATCH] haproxy/log switch to new log view
 https://github.com/opnsense/plugins/issues/1593

---
 .../opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml    | 3 ++-
 .../opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml  | 2 +-
 net/haproxy/src/www/diag_logs_haproxy.php                   | 6 ------
 3 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 net/haproxy/src/www/diag_logs_haproxy.php

diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml
index e05fc25d6..0a3aa121e 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml
@@ -4,7 +4,8 @@
         <patterns>
             <pattern>ui/haproxy/*</pattern>
             <pattern>api/haproxy/*</pattern>
-            <pattern>diag_logs_haproxy.php</pattern>
+            <pattern>ui/diagnostics/log/core/haproxy/*</pattern>
+            <pattern>api/diagnostics/log/core/haproxy/*</pattern>
         </patterns>
     </page-services-haproxy>
 </acl>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
index b91122f5d..15829a646 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
@@ -27,7 +27,7 @@
               <Counters VisibleName="Counters" url="/ui/haproxy/statistics#counters"/>
               <StickTables VisibleName="Stick Tables" url="/ui/haproxy/statistics#tables"/>
           </Statistics>
-          <Log VisibleName="Log File" order="30" url="/diag_logs_haproxy.php"/>
+          <Log VisibleName="Log File" order="30" url="/ui/diagnostics/log/core/haproxy"/>
       </HAProxy>
     </Services>
 </menu>
diff --git a/net/haproxy/src/www/diag_logs_haproxy.php b/net/haproxy/src/www/diag_logs_haproxy.php
deleted file mode 100644
index dfd8a441c..000000000
--- a/net/haproxy/src/www/diag_logs_haproxy.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$logfile = '/var/log/haproxy.log';
-$logclog = true;
-
-require_once 'diag_logs_template.inc';