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

---
 .../opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml   | 3 ++-
 .../opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml | 2 +-
 net/relayd/src/www/diag_logs_relayd.php                   | 8 --------
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 net/relayd/src/www/diag_logs_relayd.php

diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
index e0a3de073..2ee27349b 100644
--- a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
+++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
@@ -5,7 +5,8 @@
       <patterns>
          <pattern>ui/relayd/*</pattern>
          <pattern>api/relayd/*</pattern>
-         <pattern>diag_logs_relayd.php*</pattern>
+         <pattern>ui/diagnostics/log/core/relayd/*</pattern>
+         <pattern>api/diagnostics/log/core/relayd/*</pattern>
       </patterns>
    </page-services-relayd>
 </acl>
diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
index e15e5824a..5e3b62f04 100644
--- a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
+++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
@@ -3,7 +3,7 @@
       <Relayd cssClass="fa fa-truck fa-fw">
          <Settings url="/ui/relayd"/>
          <Status url="/ui/relayd/status"/>
-         <Log VisibleName="Log File" order="100" url="/diag_logs_relayd.php"/>
+         <Log VisibleName="Log File" order="100" url="/ui/diagnostics/log/core/relayd"/>
       </Relayd>
    </Services>
 </menu>
diff --git a/net/relayd/src/www/diag_logs_relayd.php b/net/relayd/src/www/diag_logs_relayd.php
deleted file mode 100644
index 638402307..000000000
--- a/net/relayd/src/www/diag_logs_relayd.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/relayd.log';
-$logclog = true;
-
-$service_hook = 'relayd';
-
-require_once 'diag_logs_template.inc';