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, 8 insertions, 28 deletions

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.