summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-08-15 15:59:53 -0700
committerStephen Hemminger <shemminger@vyatta.com>2012-08-15 16:08:19 -0700
commit42eed1c587698fd9b05917e8f0cd38f3cdd68c0c (patch)
treeadb5344c80088e04251f3ba861d6639feda336a7 /templates
parent007f39ecb4ac5b45a842af86780fe2db356c2b4c (diff)
downloadvyatta-cfg-system-42eed1c587698fd9b05917e8f0cd38f3cdd68c0c.tar.gz
vyatta-cfg-system-42eed1c587698fd9b05917e8f0cd38f3cdd68c0c.zip
Remove support for ssh protocol version
Bug 6576
Diffstat (limited to 'templates')
-rw-r--r--templates/service/ssh/node.def10
-rw-r--r--templates/service/ssh/protocol-version/node.def10
2 files changed, 2 insertions, 18 deletions
diff --git a/templates/service/ssh/node.def b/templates/service/ssh/node.def
index 55f94551..7117a2fd 100644
--- a/templates/service/ssh/node.def
+++ b/templates/service/ssh/node.def
@@ -2,13 +2,7 @@ priority: 500 # After syslog and logins
help: Secure SHell (SSH) protocol
delete:sudo /usr/sbin/invoke-rc.d ssh stop
sudo sh -c "echo 'SSHD_OPTS=' > /etc/default/ssh"
-end: if [ -z "$VAR(port/@)" ]; then exit 0; fi;
- case $VAR(protocol-version/@) in
- v2) VER=2;;
- v1) VER=1;;
- all) VER="1,2";;
- *) VER=2;;
- esac;
- STR="SSHD_OPTS=\"-p $VAR(port/@) -o Protocol=${VER}\""
+end: if [ -z "$VAR(port/@)" ]; then exit 0; fi
+ STR="SSHD_OPTS=\"-p $VAR(port/@)\""
sudo sh -c "echo '$STR' > /etc/default/ssh"
sudo /usr/sbin/invoke-rc.d ssh restart
diff --git a/templates/service/ssh/protocol-version/node.def b/templates/service/ssh/protocol-version/node.def
deleted file mode 100644
index 6b52204d..00000000
--- a/templates/service/ssh/protocol-version/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: txt
-allowed: echo "v1 v2 all"
-default: "v2"
-syntax:expression: $VAR(@) in "v1", "v2", "all" ;
- "Invalid SSH protocol version"
-
-help: SSH protocol version
-val_help: v1; Protocol version 1 (UNSECURE DO NOT USE)
-val_help: v2; Protocol version 2 (default)
-val_help: all; Both version 1 and version 2 supported