From 578ce55e56882062953e37d51e2c1cbebd437e35 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 1 May 2022 18:34:09 +0200 Subject: bcast-relay: T4353: fix Jinja2 linting errors --- data/templates/bcast-relay/udp-broadcast-relay.j2 | 5 +++++ data/templates/bcast-relay/udp-broadcast-relay.tmpl | 5 ----- src/conf_mode/bcast_relay.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 data/templates/bcast-relay/udp-broadcast-relay.j2 delete mode 100644 data/templates/bcast-relay/udp-broadcast-relay.tmpl diff --git a/data/templates/bcast-relay/udp-broadcast-relay.j2 b/data/templates/bcast-relay/udp-broadcast-relay.j2 new file mode 100644 index 000000000..75740e04c --- /dev/null +++ b/data/templates/bcast-relay/udp-broadcast-relay.j2 @@ -0,0 +1,5 @@ +### Autogenerated by bcast_relay.py ### + +# UDP broadcast relay configuration for instance {{ id }} +{{ '# ' ~ description if description is vyos_defined }} +DAEMON_ARGS="{{ '-s ' ~ address if address is vyos_defined }} {{ instance }} {{ port }} {{ interface | join(' ') }}" diff --git a/data/templates/bcast-relay/udp-broadcast-relay.tmpl b/data/templates/bcast-relay/udp-broadcast-relay.tmpl deleted file mode 100644 index 75740e04c..000000000 --- a/data/templates/bcast-relay/udp-broadcast-relay.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -### Autogenerated by bcast_relay.py ### - -# UDP broadcast relay configuration for instance {{ id }} -{{ '# ' ~ description if description is vyos_defined }} -DAEMON_ARGS="{{ '-s ' ~ address if address is vyos_defined }} {{ instance }} {{ port }} {{ interface | join(' ') }}" diff --git a/src/conf_mode/bcast_relay.py b/src/conf_mode/bcast_relay.py index d93a2a8f4..39a2971ce 100755 --- a/src/conf_mode/bcast_relay.py +++ b/src/conf_mode/bcast_relay.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2017-2020 VyOS maintainers and contributors +# Copyright (C) 2017-2022 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 @@ -78,7 +78,7 @@ def generate(relay): continue config['instance'] = instance - render(config_file_base + instance, 'bcast-relay/udp-broadcast-relay.tmpl', + render(config_file_base + instance, 'bcast-relay/udp-broadcast-relay.j2', config) return None -- cgit v1.2.3