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"

7 files changed, 28 insertions, 36 deletions

diff --git a/python/vyos/util.py b/python/vyos/util.py
index 49c47cd85..7558bd3b1 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -268,6 +268,17 @@ def process_running(pid_file):
     return pid_exists(int(pid))
 
 
+def process_named_running(name):
+    """ Checks if process with given name is running and returns its PID.
+    If Process is not running, return None
+    """
+    from psutil import process_iter
+    for p in process_iter():
+        if name in p.name():
+            return p.pid
+    return None
+
+
 def seconds_to_human(s, separator=""):
     """ Converts number of seconds passed to a human-readable
     interval such as 1w4d18h35m59s
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index dd5819f9f..7b819a863 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-2020 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -13,8 +13,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
 
 """
 conf-mode script for 'system host-name' and 'system domain-name'.
@@ -33,10 +31,7 @@ import vyos.hostsd_client
 
 from vyos.config import Config
 from vyos import ConfigError
-from vyos.util import cmd
-from vyos.util import call
-from vyos.util import run
-
+from vyos.util import cmd, call, run, process_named_running
 
 default_config_data = {
     'hostname': 'vyos',
@@ -166,12 +161,11 @@ def apply(config):
         call("systemctl restart rsyslog.service")
 
     # If SNMP is running, restart it too
-    ret = run("pgrep snmpd")
-    if ret == 0:
-        call("systemctl restart snmpd.service")
+    if process_named_running('snmpd'):
+2298:         call('systemctl restart snmpd.service')
 
     # restart pdns if it is used
-    ret = run('/usr/bin/rec_control ping')
+    ret = run('/usr/bin/rec_control --socket-dir=/run/powerdns ping')
     if ret == 0:
         call('systemctl restart pdns-recursor.service')
 
diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py
index d654dcb84..7530da2dc 100755
--- a/src/conf_mode/snmp.py
+++ b/src/conf_mode/snmp.py
@@ -535,23 +535,9 @@ def apply(snmp):
     # start SNMP daemon
     call("systemctl restart snmpd.service")
 
-    # Passwords are not available immediately in the configuration file,
-    # after daemon startup - we wait until they have been processed by
-    # snmpd, which we see when a magic line appears in this file.
-    while True:
-        while not os.path.exists(config_file_user):
-            sleep(0.5)
-
-        try:
-            with open(config_file_user, 'r') as f:
-                for line in f:
-                    # Search for our magic string inside the file
-                    if 'usmUser' in line:
-                        break
-        except IOError:
-            continue
-        else:
-            break
+    while (call('systemctl -q is-active snmpd.service') != 0):
+        print("service not yet started")
+        sleep(0.5)
 
     # net-snmp is now regenerating the configuration file in the background
     # thus we need to re-open and re-read the file as the content changed.
diff --git a/src/etc/systemd/system/pdns-recursor.service.d/override.conf b/src/etc/systemd/system/pdns-recursor.service.d/override.conf
index 602d7b774..ef4dec303 100644
--- a/src/etc/systemd/system/pdns-recursor.service.d/override.conf
+++ b/src/etc/systemd/system/pdns-recursor.service.d/override.conf
@@ -2,4 +2,4 @@
 WorkingDirectory=
 WorkingDirectory=/run/powerdns
 ExecStart=
-ExecStart=/usr/sbin/pdns_recursor --daemon=no --write-pid=no --disable-syslog --log-timestamp=no --config-dir=/run/powerdns
+ExecStart=/usr/sbin/pdns_recursor --daemon=no --write-pid=no --disable-syslog --log-timestamp=no --config-dir=/run/powerdns --socket-dir=/run/powerdns
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 = {}
 
diff --git a/src/system/on-dhcp-event.sh b/src/system/on-dhcp-event.sh
index 5046912a6..385ae460f 100755
--- a/src/system/on-dhcp-event.sh
+++ b/src/system/on-dhcp-event.sh
@@ -63,7 +63,7 @@ if [ $changes -gt 0 ]; then
   echo Success
   pid=`pgrep pdns_recursor`
   if [ -n "$pid" ]; then
-     sudo rec_control reload-zones
+     sudo rec_control --socket-dir=/run/powerdns reload-zones
   fi
 else
   echo No changes made