summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-05-13 18:43:07 +0200
committerChristian Poessinger <christian@poessinger.com>2022-05-13 18:43:09 +0200
commit37a08888d103556326ecd13e4738301ac901c861 (patch)
tree6253eabbc4ccddc70598ec556d7c50387356c6e6
parent049c8d556085db31265290e3f706c1af33b0ae85 (diff)
downloadvyos-1x-37a08888d103556326ecd13e4738301ac901c861.tar.gz
vyos-1x-37a08888d103556326ecd13e4738301ac901c861.zip
sshguard: T4408: rename whitelist-address -> allow-from
We do not only allow individual host addresses but also prefixes.
-rw-r--r--data/templates/ssh/sshguard_whitelist.j24
-rw-r--r--interface-definitions/ssh.xml.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/ssh/sshguard_whitelist.j2 b/data/templates/ssh/sshguard_whitelist.j2
index 1e05ac00f..47a950a2b 100644
--- a/data/templates/ssh/sshguard_whitelist.j2
+++ b/data/templates/ssh/sshguard_whitelist.j2
@@ -1,7 +1,7 @@
### Autogenerated by ssh.py ###
-{% if dynamic_protection is vyos_defined and dynamic_protection.whitelist_address is vyos_defined %}
-{% for address in dynamic_protection.whitelist_address %}
+{% if dynamic_protection.allow_from is vyos_defined %}
+{% for address in dynamic_protection.allow_from %}
{{ address }}
{% endfor %}
{% endif %}
diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in
index 7e2512f54..126183162 100644
--- a/interface-definitions/ssh.xml.in
+++ b/interface-definitions/ssh.xml.in
@@ -105,9 +105,9 @@
</properties>
<defaultValue>30</defaultValue>
</leafNode>
- <leafNode name="whitelist-address">
+ <leafNode name="allow-from">
<properties>
- <help>Source address or prefix</help>
+ <help>Always allow inbound connections from these systems</help>
<valueHelp>
<format>ipv4</format>
<description>Address to match against</description>