From 1964144258b3bfd0bf2afac07fef26d535b95eba Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 4 Nov 2019 18:30:32 +0100 Subject: list_interfaces: add wifi interfaces to bridgeable interfaces --- src/completion/list_interfaces.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/completion/list_interfaces.py b/src/completion/list_interfaces.py index 84d17f89f..47eeaf00c 100755 --- a/src/completion/list_interfaces.py +++ b/src/completion/list_interfaces.py @@ -16,7 +16,7 @@ args = parser.parse_args() if args.type: try: interfaces = vyos.interfaces.list_interfaces_of_type(args.type) - + except ValueError as e: print(e, file=sys.stderr) print("") @@ -35,6 +35,8 @@ elif args.bridgeable: vxlan = vyos.interfaces.list_interfaces_of_type("vxlan") wireless = vyos.interfaces.list_interfaces_of_type("wireless") tunnel = vyos.interfaces.list_interfaces_of_type("tunnel") + wireless = vyos.interfaces.list_interfaces_of_type("wireless") + interfaces = eth + bond + l2tpv3 + openvpn + vxlan + wireless + tunnel elif args.bondable: -- cgit v1.2.3 From d8131406a0c2e5956c8c494be251cda806ad103b Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 5 Nov 2019 12:57:14 -0600 Subject: T1774: fix error output --- src/services/vyos-http-api-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server index 571ec1258..1abaed873 100755 --- a/src/services/vyos-http-api-server +++ b/src/services/vyos-http-api-server @@ -221,7 +221,7 @@ def get_value(): elif config_format == 'raw': pass else: - return error(400, "\"{0}\" is not a valid config format") + return error(400, "\"{0}\" is not a valid config format".format(config_format)) else: return error(400, "\"{0}\" is not a valid operation".format(op)) except VyOSError as e: -- cgit v1.2.3 From cc2ea329b1bb2ac23ffcc64892e831e7978023e2 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 8 Nov 2019 18:34:24 +0100 Subject: ddclient: T1789: fix RFC2136 generated config Commit 967067970494c1800f ("ddclient: T1030: adjust to latest syntax") was under the impression that ddclient 3.9.0 now handles every config item with a comma in the end. This is unfortunately not true on RFC2136 dynamic DNS entries. Remove commas on config template. --- src/conf_mode/dynamic_dns.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py index 027a7f7e3..7c3b9ff6a 100755 --- a/src/conf_mode/dynamic_dns.py +++ b/src/conf_mode/dynamic_dns.py @@ -47,11 +47,11 @@ use=if, if={{ interface.interface }} {% for rfc in interface.rfc2136 -%} {% for record in rfc.record %} # RFC2136 dynamic DNS configuration for {{ record }}.{{ rfc.zone }} -server={{ rfc.server }}, -protocol=nsupdate, -password={{ rfc.keyfile }}, -ttl={{ rfc.ttl }}, -zone={{ rfc.zone }}, +server={{ rfc.server }} +protocol=nsupdate +password={{ rfc.keyfile }} +ttl={{ rfc.ttl }} +zone={{ rfc.zone }} {{ record }} {% endfor -%} {% endfor -%} -- cgit v1.2.3