diff options
| author | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-05 09:58:03 +0200 |
|---|---|---|
| committer | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-05 09:58:03 +0200 |
| commit | 46fb580fa0131f6815bbcfc95631654f6fe999a8 (patch) | |
| tree | 73ae9fcaa97d5cfab7883bc6fbf3ea036677c2a3 /data/templates/system | |
| parent | 0377b8e40b0d3e424da11194e97659c5066c0a1d (diff) | |
| parent | b6b61bc9ecf1328e67a0c15934f8bf3966a6b66d (diff) | |
| download | vyos-1x-46fb580fa0131f6815bbcfc95631654f6fe999a8.tar.gz vyos-1x-46fb580fa0131f6815bbcfc95631654f6fe999a8.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'data/templates/system')
| -rw-r--r-- | data/templates/system/curlrc.tmpl | 16 | ||||
| -rw-r--r-- | data/templates/system/ssh_config.tmpl | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/data/templates/system/curlrc.tmpl b/data/templates/system/curlrc.tmpl index 675e35a0c..3e5ce801c 100644 --- a/data/templates/system/curlrc.tmpl +++ b/data/templates/system/curlrc.tmpl @@ -1,8 +1,8 @@ -{% if http_client is defined %}
-{% if http_client.source_interface is defined %}
---interface "{{ http_client.source_interface }}"
-{% endif %}
-{% if http_client.source_address is defined %}
---interface "{{ http_client.source_address }}"
-{% endif %}
-{% endif %}
+{% if http_client is defined %} +{% if http_client.source_interface is defined %} +--interface "{{ http_client.source_interface }}" +{% endif %} +{% if http_client.source_address is defined %} +--interface "{{ http_client.source_address }}" +{% endif %} +{% endif %} diff --git a/data/templates/system/ssh_config.tmpl b/data/templates/system/ssh_config.tmpl new file mode 100644 index 000000000..509bd5479 --- /dev/null +++ b/data/templates/system/ssh_config.tmpl @@ -0,0 +1,3 @@ +{% if ssh_client is defined and ssh_client.source_address is defined and ssh_client.source_address is not none %}
+BindAddress {{ ssh_client.source_address }}
+{% endif %}
|