From b8dcfba9fa24337e9fea1904b0ae5119504c3784 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 2 Aug 2021 09:05:09 +0200
Subject: [PATCH] dns/dnscrypt-proxy: fix logging (#2467)

Fix logging due to Phalcon4 update
---
 dns/dnscrypt-proxy/Makefile                                 | 3 +--
 dns/dnscrypt-proxy/pkg-descr                                | 4 ++++
 .../mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml     | 6 +++---
 .../src/opnsense/scripts/OPNsense/Dnscryptproxy/setup.sh    | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index 54b2cc4b2..2cfd73068 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		dnscrypt-proxy
-PLUGIN_VERSION=		1.8
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.9
 PLUGIN_COMMENT=		Flexible DNS proxy supporting DNSCrypt and DoH
 PLUGIN_DEPENDS=		dnscrypt-proxy2
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/dnscrypt-proxy/pkg-descr b/dns/dnscrypt-proxy/pkg-descr
index 1728cf52f..aad8c9492 100644
--- a/dns/dnscrypt-proxy/pkg-descr
+++ b/dns/dnscrypt-proxy/pkg-descr
@@ -5,6 +5,10 @@ such as DNSCrypt v2 and DNS-over-HTTPS.
 Plugin Changelog
 ================
 
+1.9
+
+* Fix logging due to Phalcon4 update
+
 1.8
 
 * Remove 8 discontinued DNSBL lists and 2 that are not updated any more
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
index 8133628f0..da5d87e56 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
@@ -2,9 +2,9 @@
     <Services>
         <DNSCrypt-Proxy cssClass="fa fa-lock fa-fw">
             <Configuration url="/ui/dnscryptproxy/general/index" order="10"/>
-            <GeneralLog VisibleName="Log / General" order="20" url="/ui/diagnostics/log/dnscrypt-proxy/dnscrypt-proxy"/>
-            <QueryLog VisibleName="Log / Queries" order="30"  url="/ui/diagnostics/log/dnscrypt-proxy/query"/>
-            <NXLog VisibleName="Log / NX" order="40" url="/ui/diagnostics/log/dnscrypt-proxy/nx"/>
+            <GeneralLog VisibleName="Log / General" order="20" url="/ui/diagnostics/log/dnscryptproxy/dnscrypt-proxy"/>
+            <QueryLog VisibleName="Log / Queries" order="30"  url="/ui/diagnostics/log/dnscryptproxy/query"/>
+            <NXLog VisibleName="Log / NX" order="40" url="/ui/diagnostics/log/dnscryptproxy/nx"/>
         </DNSCrypt-Proxy>
     </Services>
 </menu>
diff --git a/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/setup.sh b/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/setup.sh
index 0d289f2b7..9d36378d2 100755
--- a/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/setup.sh
+++ b/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/setup.sh
@@ -2,3 +2,5 @@
 
 mkdir -p /var/log/dnscrypt-proxy
 chown -R _dnscrypt-proxy:_dnscrypt-proxy /var/log/dnscrypt-proxy
+(cd /var/log && ln -s dnscrypt-proxy dnscryptproxy)
+chown -R _dnscrypt-proxy:_dnscrypt-proxy /var/log/dnscryptproxy