diff options
-rw-r--r-- | op-mode-definitions/dns-forwarding.xml | 27 | ||||
-rwxr-xr-x | src/op_mode/dns_forwarding_reset.py | 49 | ||||
-rwxr-xr-x | src/op_mode/dns_forwarding_statistics.py | 6 |
3 files changed, 82 insertions, 0 deletions
diff --git a/op-mode-definitions/dns-forwarding.xml b/op-mode-definitions/dns-forwarding.xml index 3d7483641..f753ca93d 100644 --- a/op-mode-definitions/dns-forwarding.xml +++ b/op-mode-definitions/dns-forwarding.xml @@ -25,6 +25,9 @@ <node name="restart"> <children> <node name="dns"> + <properties> + <help>Restart a DNS service</help> + </properties> <children> <leafNode name="forwarding"> <properties> @@ -36,4 +39,28 @@ </node> </children> </node> + <node name="reset"> + <children> + <node name="dns"> + <properties> + <help>Reset a DNS service state</help> + </properties> + <children> + <node name="forwarding"> + <properties> + <help>Reset DNS forwarding cache</help> + </properties> + <children> + <tagNode name="domain"> + <command>${vyos_op_scripts_dir}/dns_forwarding_reset.py $5</command> + <properties> + <help>Reset DNS forwarding cache for a domain</help> + </properties> + </tagNode> + </children> + </node> + </children> + </node> + </children> + </node> </interfaceDefinition> diff --git a/src/op_mode/dns_forwarding_reset.py b/src/op_mode/dns_forwarding_reset.py new file mode 100755 index 000000000..1dc0d51e3 --- /dev/null +++ b/src/op_mode/dns_forwarding_reset.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2018 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 +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# File: vyos-show-version +# Purpose: +# Displays image version and system information. +# Used by the "run show version" command. + + +import os +import sys +import argparse + +import vyos.config + +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") + +if __name__ == '__main__': + args = parser.parse_args() + + # Do nothing if service is not configured + c = vyos.config.Config() + if not c.exists_effective('service dns forwarding'): + print("DNS forwarding is not configured") + sys.exit(0) + + if args.all: + print("Unimplemented, broken in pdns 3.x") + sys.exit(1) + elif args.domain: + os.system("rec_control wipe-cache {0}".format(args.domain)) + else: + parser.print_help() + sys.exit(1) diff --git a/src/op_mode/dns_forwarding_statistics.py b/src/op_mode/dns_forwarding_statistics.py index 3d1e30aee..aa6ffdf37 100755 --- a/src/op_mode/dns_forwarding_statistics.py +++ b/src/op_mode/dns_forwarding_statistics.py @@ -15,6 +15,12 @@ Cache size: {{ cache_size }} kbytes if __name__ == '__main__': + # Do nothing if service is not configured + c = vyos.config.Config() + if not c.exists_effective('service dns forwarding'): + print("DNS forwarding is not configured") + sys.exit(0) + data = {} data['cache_entries'] = subprocess.check_output([PDNS_CMD, 'get cache-entries']).decode() |