diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-15 22:03:09 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-15 22:03:09 +0200 |
| commit | 16b2fc8fc4cae96f027e036f259c10dc793bf5e5 (patch) | |
| tree | db6b6987e168137ed24c8fa8b6a15cabec096050 /src/conf_mode/host_name.py | |
| parent | b5de1daab68d223174476f653f5a591c1e0e4de6 (diff) | |
| download | vyos-1x-16b2fc8fc4cae96f027e036f259c10dc793bf5e5.tar.gz vyos-1x-16b2fc8fc4cae96f027e036f259c10dc793bf5e5.zip | |
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"
Diffstat (limited to 'src/conf_mode/host_name.py')
| -rwxr-xr-x | src/conf_mode/host_name.py | 16 |
1 files changed, 5 insertions, 11 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') |