diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
| commit | bacecf80ea16d3cd30dc7c98c98af013b2adc258 (patch) | |
| tree | 2b1d6f48708ace28ae4f6c9893ee50f6f390c6b7 /templates/service/snmp/v3/tsm | |
| parent | 0d8e75e2e808ccf366a1527647a6353c09d92237 (diff) | |
| parent | 0f19dc57ed6588c083eee8aa9aee09b92b441b08 (diff) | |
| download | vyatta-cfg-system-lithium.tar.gz vyatta-cfg-system-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
debian/changelog
scripts/snmp/vyatta-snmp-v3.pl
scripts/snmp/vyatta-snmp.pl
templates/interfaces/tunnel/node.def
templates/system/sysctl/custom/node.def
Diffstat (limited to 'templates/service/snmp/v3/tsm')
| -rw-r--r-- | templates/service/snmp/v3/tsm/local-key/node.def | 14 | ||||
| -rw-r--r-- | templates/service/snmp/v3/tsm/node.def | 3 | ||||
| -rw-r--r-- | templates/service/snmp/v3/tsm/port/node.def | 7 |
3 files changed, 0 insertions, 24 deletions
diff --git a/templates/service/snmp/v3/tsm/local-key/node.def b/templates/service/snmp/v3/tsm/local-key/node.def deleted file mode 100644 index a630dff8..00000000 --- a/templates/service/snmp/v3/tsm/local-key/node.def +++ /dev/null @@ -1,14 +0,0 @@ -type: txt -help: Defines the server certificate fingerprint or key-file name. -allowed: if sudo [ -d /etc/snmp/tls/certs ]; then - sudo ls /etc/snmp/tls/certs 2> /dev/null - else - sudo ls /config/snmp/tls/certs 2> /dev/null - fi -syntax:expression: pattern $VAR(@) "^[0-9A-F]{2}(:[0-9A-F]{2}){19}$" || - exec "if sudo [ -f /etc/snmp/tls/certs/$VAR(@) -o -f /config/snmp/tls/certs/$VAR(@) ]; \ - then \ - exit 0; \ - else \ - exit 1; \ - fi" ; "value can be finger print key or filename in /config/snmp/tls/certs/ folder"
\ No newline at end of file diff --git a/templates/service/snmp/v3/tsm/node.def b/templates/service/snmp/v3/tsm/node.def deleted file mode 100644 index 3d12f21d..00000000 --- a/templates/service/snmp/v3/tsm/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Specifies that the snmpd uses encryption. -commit:expression: $VAR(port/) != "" ; "must specify port" -commit:expression: $VAR(local-key/) != "" ; "must specify local-key"
\ No newline at end of file diff --git a/templates/service/snmp/v3/tsm/port/node.def b/templates/service/snmp/v3/tsm/port/node.def deleted file mode 100644 index 86fd6cca..00000000 --- a/templates/service/snmp/v3/tsm/port/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: u32 -default: 10161 -help: Defines the port for tsm. - -val_help: u32:1-65535; Numeric IP port -syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \ - "Port number must be in range 1 to 65535" |