diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-01-17 13:25:17 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-01-17 13:25:17 +0100 |
| commit | e0159c838b6b186ef55ef7aa68a96315a1615fbb (patch) | |
| tree | 690c30cf94aeda3a9de8d018fb136291178d9ae4 | |
| parent | b104bf820801008ea60b4b11232053825b21d890 (diff) | |
| download | vyatta-cfg-system-e0159c838b6b186ef55ef7aa68a96315a1615fbb.tar.gz vyatta-cfg-system-e0159c838b6b186ef55ef7aa68a96315a1615fbb.zip | |
T671: drop SSH key generation and move this to vyos-1x
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | scripts/rl-system.init | 17 | ||||
| -rw-r--r-- | sysconf/default_ssh | 1 |
3 files changed, 0 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index d23b9ced..1978c90a 100644 --- 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 index cc78700b..6ea1dcae 100755 --- 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 deleted file mode 100644 index bbdf535d..00000000 --- a/sysconf/default_ssh +++ /dev/null @@ -1 +0,0 @@ -SSHD_OPTS= |