dns-forwarding: T2298: fix path to control file

After migrating PowerDNS to systemd and also its configuration files to a
volatile directory in commit 77d725f ("dns-forwarding: T2185: move configuration
files to volatile /run directory") the path for the control file has not
been altered and pushed to the client rec_control binary"

2 files changed, 7 insertions, 6 deletions

diff --git a/src/op_mode/dns_forwarding_reset.py b/src/op_mode/dns_forwarding_reset.py
index 8e2ee546c..bfc640a26 100755
--- a/src/op_mode/dns_forwarding_reset.py
+++ b/src/op_mode/dns_forwarding_reset.py
@@ -27,6 +27,8 @@ from sys import exit
 from vyos.config import Config
 from vyos.util import call
 
+PDNS_CMD='/usr/bin/rec_control --socket-dir=/run/powerdns'
+
 parser = argparse.ArgumentParser()
 parser.add_argument("-a", "--all", action="store_true", help="Reset all cache")
 parser.add_argument("domain", type=str, nargs="?", help="Domain to reset cache entries for")
@@ -41,11 +43,11 @@ if __name__ == '__main__':
         exit(0)
 
     if args.all:
-        call("rec_control wipe-cache \'.$\'")
+        call(f"{PDNS_CMD} wipe-cache \'.$\'")
         exit(0)
 
     elif args.domain:
-        call("rec_control wipe-cache \'{0}$\'".format(args.domain))
+        call(f"{PDNS_CMD} wipe-cache \'{0}$\'".format(args.domain))
 
     else:
         parser.print_help()
diff --git a/src/op_mode/dns_forwarding_statistics.py b/src/op_mode/dns_forwarding_statistics.py
index c400a72cd..8ae92beb7 100755
--- a/src/op_mode/dns_forwarding_statistics.py
+++ b/src/op_mode/dns_forwarding_statistics.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 
 import jinja2
-import sys
+from sys import exit
 
 from vyos.config import Config
 from vyos.config import cmd
 
-PDNS_CMD='/usr/bin/rec_control'
+PDNS_CMD='/usr/bin/rec_control --socket-dir=/run/powerdns'
 
 OUT_TMPL_SRC = """
 DNS forwarding statistics:
@@ -16,13 +16,12 @@ Cache size: {{ cache_size }} kbytes
 
 """
 
-
 if __name__ == '__main__':
     # Do nothing if service is not configured
     c = Config()
     if not c.exists_effective('service dns forwarding'):
         print("DNS forwarding is not configured")
-        sys.exit(0)
+        exit(0)
 
     data = {}