diff --git a/files/1160-openssh-server b/files/1160-openssh-server deleted file mode 100755 index 0df712f..0000000 --- a/files/1160-openssh-server +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -## live-config(7) - System Configuration Components -## Copyright (C) 2006-2014 Daniel Baumann -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -#set -e - -Init () -{ - # Checking if package is installed or already configured - if [ ! -e /var/lib/dpkg/info/openssh-server.list ] || \ - [ -e /var/lib/live/config/openssh-server ] - then - exit 0 - fi - - echo -n " openssh-server" -} - -Config () -{ - for _PROTOCOL in dsa rsa ecdsa ed25519 - do - if [ ! -e /etc/ssh/ssh_host_${_PROTOCOL}_key ] && - grep -qs ssh_host_${_PROTOCOL}_key /etc/ssh/sshd_config - then - ssh-keygen -q -f /etc/ssh/ssh_host_${_PROTOCOL}_key -N "" -t ${_PROTOCOL} - - _SSH="true" - fi - done - - sed -i -e 's|#\(PasswordAuthentication\) yes|\1 no|' /etc/ssh/sshd_config - - case "${_SSH}" in - true) - # Creating state file - touch /var/lib/live/config/openssh-server - ;; - esac -} - -Init -Config diff --git a/tasks/main.yml b/tasks/main.yml index 449548a..8541c5f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -75,12 +75,6 @@ src: isolinux.cfg.j2 dest: "{{ debian_live_build_directory }}/config/includes.binary/isolinux/isolinux.cfg" -- name: fix debian jessie generate ssh host ed25519 keys directory - file: - path: "{{ debian_live_build_directory }}/config/includes.chroot/lib/live/config" - state: directory - when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' - - name: fix debian jessie generate ssh host ed25519 keys copy: src: 1160-openssh-server