summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--templates/interfaces/tunnel/node.tag/address/node.def2
-rw-r--r--templates/interfaces/tunnel/node.tag/encapsulation/node.def5
-rw-r--r--templates/interfaces/tunnel/node.tag/key/node.def2
-rw-r--r--templates/interfaces/tunnel/node.tag/local-ip/node.def5
-rw-r--r--templates/interfaces/tunnel/node.tag/mtu/node.def3
-rw-r--r--templates/interfaces/tunnel/node.tag/tos/node.def2
-rw-r--r--templates/interfaces/tunnel/node.tag/ttl/node.def3
7 files changed, 17 insertions, 5 deletions
diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def
index af198670..06605f45 100644
--- a/templates/interfaces/tunnel/node.tag/address/node.def
+++ b/templates/interfaces/tunnel/node.tag/address/node.def
@@ -6,5 +6,3 @@ update: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $(@) --dev
delete: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $(@) --dev $(../@)"; "Error deleting address $(@) on interface $(../@)"
#comp_help:Possible completions:
# <IP address>/<prefix length>\tSet the IP address and prefix length
-# dhcp\t\t\t\tSet the IP address and prefix length via DHCP
-
diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
index b578c543..9b495228 100644
--- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def
+++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
@@ -1,5 +1,8 @@
type: txt
help: "Set the encapsulation of this tunnel interface"
syntax: $(@) in "ipip", "gre", "sit"; "Must be (ipip, gre, sit)"
-#comp_help: "Select an encapsulation (gre, ipip, sit)"
update: "sudo ip tunnel change $(../@) mode $(@)"
+#comp_help: "possible completions:
+# gre Set Generic Routing Encapsulation
+# ipip Set IP in IP encapsulation
+# sit Set Simple Internet Transition encapsulation
diff --git a/templates/interfaces/tunnel/node.tag/key/node.def b/templates/interfaces/tunnel/node.tag/key/node.def
index 3261229d..691b1cbd 100644
--- a/templates/interfaces/tunnel/node.tag/key/node.def
+++ b/templates/interfaces/tunnel/node.tag/key/node.def
@@ -2,3 +2,5 @@ type: u32
help: "Set the tunnel key"
syntax: $(@) >= 0 && $(@) <= 999999; "Must be between 0-999999"
update: "sudo ip tunnel change $(../@) key $(@)"
+#comp_help: possible completions
+# <0-999999> Set a tunnel key
diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def
index 6b306a3c..3276c636 100644
--- a/templates/interfaces/tunnel/node.tag/local-ip/node.def
+++ b/templates/interfaces/tunnel/node.tag/local-ip/node.def
@@ -1,3 +1,6 @@
type: ipv4
help: "Enter the local IP address for this tunnel"
-
+syntax: exec "if [ -z \"`ip addr list | grep $(@) `\" ]; then \
+ echo IP address $(@) doesn\\'t exist on this system ; \
+ exit 1 ; \
+ fi ; "
diff --git a/templates/interfaces/tunnel/node.tag/mtu/node.def b/templates/interfaces/tunnel/node.tag/mtu/node.def
index 80ea5b06..ffdcc735 100644
--- a/templates/interfaces/tunnel/node.tag/mtu/node.def
+++ b/templates/interfaces/tunnel/node.tag/mtu/node.def
@@ -3,4 +3,5 @@ help: "Set the tunnel MTU"
syntax: $(@) >= 64 && $(@) <= 8024; "Must be between 64-8024"
update: "sudo ip link set $(../@) mtu $(@)"
delete: "sudo ip link set $(../@) mtu 1476"
-
+#comp_help: possible completions:
+# <64-8024> Set MTU
diff --git a/templates/interfaces/tunnel/node.tag/tos/node.def b/templates/interfaces/tunnel/node.tag/tos/node.def
index 7e3d28ae..56a6c9e2 100644
--- a/templates/interfaces/tunnel/node.tag/tos/node.def
+++ b/templates/interfaces/tunnel/node.tag/tos/node.def
@@ -3,3 +3,5 @@ help: "Set the tunnel type of service"
syntax: $(@) >= 0 && $(@) <= 99; "Must be between 0-99"
update: "sudo ip tunnel change $(../@) tos $(@)"
delete: "sudo ip tunnel change $(../@) tos inherit"
+#comp_help: possible completions
+# <0-99> Set type of service
diff --git a/templates/interfaces/tunnel/node.tag/ttl/node.def b/templates/interfaces/tunnel/node.tag/ttl/node.def
index 2cb09c73..7bdfdeaa 100644
--- a/templates/interfaces/tunnel/node.tag/ttl/node.def
+++ b/templates/interfaces/tunnel/node.tag/ttl/node.def
@@ -1,5 +1,8 @@
type: u32
help: "Set the tunnel time to live"
+default: 255
syntax: $(@) >= 0 && $(@) <= 255; "Must be between 0-255"
update: "sudo ip tunnel change $(../@) ttl $(@)"
delete: "sudo ip tunnel change $(../@) ttl inherit"
+#comp_help: possible completions:
+# <0-255> Set time to live (default 255)