summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2014-08-03 12:51:10 +0200
committerDaniil Baturin <daniil@baturin.org>2014-08-03 12:51:10 +0200
commit357c39cf09a144ecda5e77d17e13b29a0356efc1 (patch)
tree02e2a14effbe5498a324904da800ac70d7710d57
parentbec1f60a7a4af3aeefc9e0aac790c06172619b99 (diff)
downloadvyatta-cfg-vpn-357c39cf09a144ecda5e77d17e13b29a0356efc1.tar.gz
vyatta-cfg-vpn-357c39cf09a144ecda5e77d17e13b29a0356efc1.zip
Bug #224: rename "enabled|disabled" to "enable|disable" for consistency.
-rwxr-xr-xscripts/vpn-config.pl4
-rw-r--r--templates/vpn/ipsec/ike-group/node.tag/mobike/node.def8
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl
index b1d0976..e761ea5 100755
--- a/scripts/vpn-config.pl
+++ b/scripts/vpn-config.pl
@@ -916,10 +916,10 @@ if ( $vcVPN->exists('ipsec') ) {
if ( defined($mob_ike) ) {
if ( defined($key_exchange) && $key_exchange eq 'ikev2' ) {
- if ($mob_ike eq 'enabled') {
+ if ($mob_ike eq 'enable') {
$genout .= "\tmobike=yes\n";
}
- if ($mob_ike eq 'disabled') {
+ if ($mob_ike eq 'disable') {
$genout .= "\tmobike=no\n";
}
}
diff --git a/templates/vpn/ipsec/ike-group/node.tag/mobike/node.def b/templates/vpn/ipsec/ike-group/node.tag/mobike/node.def
index fe2656f..d03f30c 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/mobike/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/mobike/node.def
@@ -1,5 +1,5 @@
-help: Enable MOBIKE Support. MOBIKE is only valid for IKEv2 configurations.
+help: Enable MOBIKE Support. MOBIKE is only available for IKEv2.
type: txt
-syntax:expression: $VAR(@) in "enabled", "disabled"; "must be enabled or disabled"
-val_help: enabled; Enable MOBIKE ([DEFAULT] if IKEv2)
-val_help: disabled; Disable MOBIKE
+syntax:expression: $VAR(@) in "enable", "disable"; "must be enabled or disabled"
+val_help: enable; Enable MOBIKE (default for IKEv2)
+val_help: disable; Disable MOBIKE