summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-02-04 16:11:14 +0100
committerGitHub <noreply@github.com>2023-02-04 16:11:14 +0100
commit9ee41e63880ea52d058c90d15837d6ebd48f0a80 (patch)
treef5df010f70d8216d497b5f562e197c9a2e6cacbd /data/templates
parentd56956df82c036d9ca0cb11626265951b970545d (diff)
parentca70102fcf782e7a61d3d1b7672d74eb8db32129 (diff)
downloadvyos-1x-9ee41e63880ea52d058c90d15837d6ebd48f0a80.tar.gz
vyos-1x-9ee41e63880ea52d058c90d15837d6ebd48f0a80.zip
Merge pull request #1603 from nicolas-fort/T2408
T2408: dhcp-relay: Add listen-interface and upstream-interface feature
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/dhcp-relay/dhcrelay.conf.j25
1 files changed, 4 insertions, 1 deletions
diff --git a/data/templates/dhcp-relay/dhcrelay.conf.j2 b/data/templates/dhcp-relay/dhcrelay.conf.j2
index 11710bd8e..c26c263fd 100644
--- a/data/templates/dhcp-relay/dhcrelay.conf.j2
+++ b/data/templates/dhcp-relay/dhcrelay.conf.j2
@@ -2,5 +2,8 @@
{% set max_size = '-A ' ~ relay_options.max_size if relay_options.max_size is vyos_defined %}
{# hop_count and relay_agents_packets is a default option, thus it is always present #}
+{% if interface is vyos_defined %}
OPTIONS="-c {{ relay_options.hop_count }} -a -m {{ relay_options.relay_agents_packets }} {{ max_size }} -i {{ interface | join(' -i ') }} {{ server | join(' ') }}"
-
+{% else %}
+OPTIONS="-c {{ relay_options.hop_count }} -a -m {{ relay_options.relay_agents_packets }} {{ max_size }} -id {{ listen_interface | join(' -id ') }} -iu {{ upstream_interface | join(' -iu ') }} {{ server | join(' ') }}"
+{% endif %} \ No newline at end of file