diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-03-09 19:18:09 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@vyos.io> | 2020-03-09 19:18:09 +0200 |
| commit | bccc44d196cc6b7149510d750946a64eecbf2b6e (patch) | |
| tree | 45fd93c55e149295746dce9a916bbb0dfa223b89 | |
| parent | 7eb63450e821e7e322cc5211499fa94c31480ec4 (diff) | |
| parent | 3a192885d754ca71051cb3420e17de570c1aa88c (diff) | |
| download | vyatta-cfg-vpn-bccc44d196cc6b7149510d750946a64eecbf2b6e.tar.gz vyatta-cfg-vpn-bccc44d196cc6b7149510d750946a64eecbf2b6e.zip | |
Merge branch 'crux' of github.com:vyos/vyatta-cfg-vpn into cruxvyos/1.2.5
| -rwxr-xr-x | scripts/vpn-config.pl | 8 | ||||
| -rw-r--r-- | templates/vpn/ipsec/ike-group/node.tag/close-action/node.def | 8 | ||||
| -rw-r--r-- | templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def | 6 |
3 files changed, 19 insertions, 3 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl index d68e419..369e568 100755 --- a/scripts/vpn-config.pl +++ b/scripts/vpn-config.pl @@ -811,6 +811,14 @@ if ($vcVPN->exists('ipsec')) { } # + # Check for closeaction + # + my $close_act = $vcVPN->returnValue("ipsec ike-group $ike_group close-action"); + if (defined($close_act)) { + $genout .= "\tcloseaction=$close_act\n"; + } + + # # Allow the user for force UDP encapsulation for the ESP # payload. # diff --git a/templates/vpn/ipsec/ike-group/node.tag/close-action/node.def b/templates/vpn/ipsec/ike-group/node.tag/close-action/node.def new file mode 100644 index 0000000..0c05c21 --- /dev/null +++ b/templates/vpn/ipsec/ike-group/node.tag/close-action/node.def @@ -0,0 +1,8 @@ +help: Action if the remote peer unexpectedly closes a CHILD_SA +type: txt +default: "none" +syntax:expression: $VAR(@) in "none","hold", "clear", "restart"; "must be none, hold clear, or restart" +val_help: none; Set action to none (default) +val_help: hold; Set action to hold +val_help: clear; Set action to clear +val_help: restart; Set action to restart diff --git a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def index 3378cb5..8a4edee 100644 --- a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def +++ b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def @@ -1,5 +1,5 @@ -help: Keep-alive timeout +help: Dead-Peer-Detection keep-alive timeout (IKEv1 only) type: u32 default: 120 -syntax:expression: ($VAR(@) >= 10 && $VAR(@) <= 86400) ; "must be between 10-86400 seconds" -val_help: u32:10-86400; Keep-alive timeout in seconds (default 120) +syntax:expression: ($VAR(@) >= 2 && $VAR(@) <= 86400) ; "must be between 2-86400 seconds" +val_help: u32:2-86400; Keep-alive timeout in seconds (default 120) |