From c3739b875ba1f5f6fe75b8ece18b0b18f45eba77 Mon Sep 17 00:00:00 2001 From: Marcin Engelmann Date: Thu, 18 Jan 2018 09:48:13 +0100 Subject: [PATCH] Removed generate-ssh-hostkeys stub-script left for backward compatibility --- .../common/assets/init.d/generate-ssh-hostkeys | 14 -------------- bootstrapvz/common/tasks/ssh.py | 6 ------ 2 files changed, 20 deletions(-) delete mode 100644 bootstrapvz/common/assets/init.d/generate-ssh-hostkeys diff --git a/bootstrapvz/common/assets/init.d/generate-ssh-hostkeys b/bootstrapvz/common/assets/init.d/generate-ssh-hostkeys deleted file mode 100644 index cb51e3d..0000000 --- a/bootstrapvz/common/assets/init.d/generate-ssh-hostkeys +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Kept for backward compatibility. OpenSSH Host Keys are generated -# by "ssh-generate-hostkeys.service" systemd unit or "ssh-generate-hostkeys" -# sysvinit script (#431). - -set -eu - -if [ -z "${1+x}" ] || [ -z "$1" ]; then - PAR="start" -else - PAR="$1" -fi - -exec /etc/init.d/ssh-generate-hostkeys "$PAR" diff --git a/bootstrapvz/common/tasks/ssh.py b/bootstrapvz/common/tasks/ssh.py index 1c5c651..1941313 100644 --- a/bootstrapvz/common/tasks/ssh.py +++ b/bootstrapvz/common/tasks/ssh.py @@ -45,18 +45,12 @@ class AddSSHKeyGeneration(Task): ssh_keygen_host_service = os.path.join(systemd_dir, 'ssh-generate-hostkeys.service') ssh_keygen_host_service_dest = os.path.join(info.root, 'etc/systemd/system/ssh-generate-hostkeys.service') - ssh_keygen_host_initscript = os.path.join(init_scripts_dir, 'generate-ssh-hostkeys') - ssh_keygen_host_initscript_dest = os.path.join(info.root, 'etc/init.d/generate-ssh-hostkeys') - ssh_keygen_host_script = os.path.join(assets, 'ssh-generate-hostkeys') ssh_keygen_host_script_dest = os.path.join(info.root, 'usr/local/sbin/ssh-generate-hostkeys') # Copy files over shutil.copy(ssh_keygen_host_service, ssh_keygen_host_service_dest) - shutil.copy(ssh_keygen_host_initscript, ssh_keygen_host_initscript_dest) - os.chmod(ssh_keygen_host_initscript_dest, 0755) - shutil.copy(ssh_keygen_host_script, ssh_keygen_host_script_dest) os.chmod(ssh_keygen_host_script_dest, 0750)