diff --git a/README.md b/README.md index 992d94d..ec31705 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Tested on: * Debian wheezy, jessie * FreeBSD 10.1 * EL 6,7 derived distributions -* Fedora 20, 22 +* Fedora 22, 23 It will likely work on other flavours and more direct support via suitable [vars/](vars/) files is welcome. diff --git a/meta/main.yml b/meta/main.yml index ce10ca7..9c526fd 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -23,8 +23,8 @@ galaxy_info: - 7 - name: Fedora versions: - - 20 - 22 + - 23 categories: - networking - system diff --git a/vars/Fedora.yml b/vars/Fedora.yml index aeafd85..883a028 100644 --- a/vars/Fedora.yml +++ b/vars/Fedora.yml @@ -7,6 +7,7 @@ sshd_defaults: HostKey: - /etc/ssh/ssh_host_rsa_key - /etc/ssh/ssh_host_ecdsa_key + - /etc/ssh/ssh_host_ed25519_key SyslogFacility: AUTHPRIV AuthorizedKeysFile: .ssh/authorized_keys PasswordAuthentication: yes diff --git a/vars/Fedora_22.yml b/vars/Fedora_22.yml deleted file mode 100644 index 883a028..0000000 --- a/vars/Fedora_22.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -sshd_packages: - - openssh - - openssh-server -sshd_sftp_server: /usr/libexec/openssh/sftp-server -sshd_defaults: - HostKey: - - /etc/ssh/ssh_host_rsa_key - - /etc/ssh/ssh_host_ecdsa_key - - /etc/ssh/ssh_host_ed25519_key - SyslogFacility: AUTHPRIV - AuthorizedKeysFile: .ssh/authorized_keys - PasswordAuthentication: yes - ChallengeResponseAuthentication: no - GSSAPIAuthentication: yes - GSSAPICleanupCredentials: no - UsePAM: yes - X11Forwarding: yes - UsePrivilegeSeparation: sandbox - AcceptEnv: - - LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES - - LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT - - LC_IDENTIFICATION LC_ALL LANGUAGE - - XMODIFIERS - Subsystem: "sftp {{ sshd_sftp_server }}" -sshd_os_supported: yes