T671: drop SSH key generation and move this to vyos-1x

vyos · Jan 17, 2021 · e0159c8 · e0159c8
1 parent b104bf8
commit e0159c8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 19 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -62,7 +62,6 @@ sysconf_DATA += sysconf/issue
 sysconf_DATA += sysconf/issue.net
 sysconf_DATA += sysconf/motd.tail
 sysconf_DATA += sysconf/rsyslog.conf
-sysconf_DATA += sysconf/default_ssh
 sysconf_DATA += sysconf/securetty
 sysconf_DATA += sysconf/vyatta-sysctl.conf
 sysconf_DATA += sysconf/level

diff --git a/scripts/rl-system.init b/scripts/rl-system.init
@@ -103,21 +103,6 @@ update_interface_config () {
     fi
 }
 
-create_ssh_host_keys () {
-    if [ ! -f "/etc/ssh/ssh_host_rsa_key" ]; then
-        syslog "Creating ssh v2 rsa host key."
-        ssh-keygen -q -N '' -t rsa -f /etc/ssh/ssh_host_rsa_key
-    fi;
-    if [ ! -f "/etc/ssh/ssh_host_dsa_key" ]; then
-        syslog "Creating ssh v2 dsa host key."
-        ssh-keygen -q -N '' -t dsa -f /etc/ssh/ssh_host_dsa_key
-    fi;
-    if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]; then
-        syslog "Creating ssh ed25519 host key."
-        ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key
-    fi;
-}
-
 # These are all the default security setting which are later
 # overridden when configuration is read. These are the values the
 # system defaults.
@@ -142,8 +127,6 @@ start () {
     mount -t bpf none /sys/fs/bpf
 
     update_interface_config
-    create_ssh_host_keys || \
-	log_failure_msg "can't initialize ssh host keys"
     clear_or_override_config_files || \
 	log_failure_msg "can\'t reset config files"
 

diff --git a/sysconf/default_ssh b/sysconf/default_ssh