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

---
 .../opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml  | 3 ++-
 .../mvc/app/models/OPNsense/Postfix/Menu/Menu.xml         | 2 +-
 mail/postfix/src/www/diag_logs_postfix.php                | 8 --------
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 mail/postfix/src/www/diag_logs_postfix.php

diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml
index 572f60847..0adf3f605 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml
@@ -9,7 +9,8 @@
     <page-services-postfix-log>
         <name>Services: Postfix: Log File</name>
         <patterns>
-            <pattern>diag_logs_postfix.php</pattern>
+            <pattern>ui/diagnostics/log/core/mail/*</pattern>
+            <pattern>api/diagnostics/log/core/mail/*</pattern>
         </patterns>
     </page-services-postfix-log>
 </acl>
diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Menu/Menu.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Menu/Menu.xml
index 8bd3a1067..b93892062 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Menu/Menu.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Menu/Menu.xml
@@ -9,7 +9,7 @@
       <Senderbcc VisibleName="Sender BCC" url="/ui/postfix/senderbcc/index" order="45"/>
       <Sendercanonical VisibleName="Sender Canonical Rewriting" url="/ui/postfix/sendercanonical/index" order="48"/>
       <Address VisibleName="Address Rewriting" url="/ui/postfix/address/index" order="50"/>
-      <LogFile VisibleName="Log File" order="50" url="/diag_logs_postfix.php"/>
+      <LogFile VisibleName="Log File" order="50" url="/ui/diagnostics/log/core/mail"/>
     </Postfix>
   </Services>
 </menu>
diff --git a/mail/postfix/src/www/diag_logs_postfix.php b/mail/postfix/src/www/diag_logs_postfix.php
deleted file mode 100644
index 208fe909f..000000000
--- a/mail/postfix/src/www/diag_logs_postfix.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$logfile = '/var/log/mail.log';
-$logclog = true;
-
-$service_hook = 'postfix';
-
-require_once 'diag_logs_template.inc';