diff options
| author | Kim Hagen <khagen@multi-development.com> | 2015-02-16 08:34:18 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-02-27 19:59:10 +0100 |
| commit | fc5c544c0606cc0f542ea211af799b01e236a180 (patch) | |
| tree | e88a06fa219ed803d015a4f74ef7409b018b27d2 | |
| parent | d386b9adac3dcad0035da5d3fd5a4b05af26423b (diff) | |
| download | vyatta-cfg-vpn-fc5c544c0606cc0f542ea211af799b01e236a180.tar.gz vyatta-cfg-vpn-fc5c544c0606cc0f542ea211af799b01e236a180.zip | |
Move execution of nhrp script to "end" of ipsec config so it executes on all changes made
to the ipsec config
| -rw-r--r-- | templates/vpn/ipsec/profile/node.tag/bind/tunnel/node.def | 4 | ||||
| -rw-r--r-- | templates/vpn/node.def | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/templates/vpn/ipsec/profile/node.tag/bind/tunnel/node.def b/templates/vpn/ipsec/profile/node.tag/bind/tunnel/node.def index cf3568b..a04f8cb 100644 --- a/templates/vpn/ipsec/profile/node.tag/bind/tunnel/node.def +++ b/templates/vpn/ipsec/profile/node.tag/bind/tunnel/node.def @@ -8,7 +8,3 @@ commit:expression: $VAR(../../ike-group/) != ""; "Must configure ike-group" commit:expression: $VAR(../../authentication/) != ""; "Must configure authentication" commit:expression: (`cli-shell-api returnValue interfaces tunnel $VAR(@) encapsulation` == "gre" && \ `cli-shell-api returnValue interfaces tunnel $VAR(@) remote-ip` == ""); "Must be mgre tunnel" - -end: - - sudo /opt/vyatta/sbin/vyos-update-nhrp.pl --set_ipsec diff --git a/templates/vpn/node.def b/templates/vpn/node.def index c504aaa..7c6b56a 100644 --- a/templates/vpn/node.def +++ b/templates/vpn/node.def @@ -5,6 +5,7 @@ end:sudo /opt/vyatta/sbin/vyatta-vti-config.pl || exit 1 --config_file='/etc/dmvpn.conf' \ --secrets_file='/etc/dmvpn.secrets' \ --init_script='/etc/init.d/ipsec' || exit 1 + sudo /opt/vyatta/sbin/vyos-update-nhrp.pl --set_ipsec || exit 1 sudo /opt/vyatta/sbin/vpn-config.pl \ --config_file='/etc/ipsec.conf' \ --secrets_file='/etc/ipsec.secrets' \ |