diff options
| author | hagbard <vyosdev@derith.de> | 2019-10-11 11:48:33 -0700 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-10-11 11:48:33 -0700 |
| commit | c5ae327c93c06639bd6bca725e130703d57480d9 (patch) | |
| tree | d349b5a1463e46b7b5967519ebf84df66c36ed45 /src | |
| parent | 9b5867b7345e14cd7b738b51ae5b17a524e461f5 (diff) | |
| parent | b8996f98127699d14626f254a27d26b9f5748b70 (diff) | |
| download | vyos-1x-c5ae327c93c06639bd6bca725e130703d57480d9.tar.gz vyos-1x-c5ae327c93c06639bd6bca725e130703d57480d9.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/interface-wireguard.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/snmp.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/conf_mode/interface-wireguard.py b/src/conf_mode/interface-wireguard.py index 0dcce6b1c..7a684bafa 100755 --- a/src/conf_mode/interface-wireguard.py +++ b/src/conf_mode/interface-wireguard.py @@ -190,6 +190,8 @@ def verify(c): raise ConfigError("ERROR: allowed-ips required for peer " + p) if not c['peer'][p]['pubkey']: raise ConfigError("peer pubkey required for peer " + p) + if not c['peer'][p]['endpoint']: + raise ConfigError("peer endpoint required for peer " + p) def apply(c): diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py index 0ddab2129..60e4c343d 100755 --- a/src/conf_mode/snmp.py +++ b/src/conf_mode/snmp.py @@ -224,7 +224,7 @@ init_config_tmpl = """ SNMPDRUN=yes # snmpd options (use syslog, close stdin/out/err). -SNMPDOPTS='-LSed -u snmp -g snmp -p /run/snmpd.pid' +SNMPDOPTS='-LSed -u snmp -g snmp -I -ipCidrRouteTable, inetCidrRouteTable -p /run/snmpd.pid' """ default_config_data = { |