From eb3e2d4b364164f358e84e83fa2ff2f267eb67ba Mon Sep 17 00:00:00 2001 From: Lilian Roller Date: Wed, 20 Nov 2019 09:44:44 +0100 Subject: [PATCH] Add sftp variable --- templates/sshd_config.j2 | 3 ++- vars/archlinux.yml | 1 + vars/centos.yml | 1 + vars/default.yml | 1 + vars/fedora.yml | 1 + vars/main.yml | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/templates/sshd_config.j2 b/templates/sshd_config.j2 index 82ddedd..ae620ed 100644 --- a/templates/sshd_config.j2 +++ b/templates/sshd_config.j2 @@ -97,6 +97,7 @@ AcceptEnv LANG LC_* PrintMotd no # sftp (required by ansible) -Subsystem sftp /usr/lib/openssh/sftp-server +# Subsystem sftp /usr/lib/openssh/sftp-server +Subsystem sftp {{ sftp_binary }} # ETC diff --git a/vars/archlinux.yml b/vars/archlinux.yml index 164876b..1ccb518 100644 --- a/vars/archlinux.yml +++ b/vars/archlinux.yml @@ -1,2 +1,3 @@ --- ssh_service: sshd +sftp_server: '/usr/lib/openssh/sftp-server' diff --git a/vars/centos.yml b/vars/centos.yml index 164876b..dfe45d8 100644 --- a/vars/centos.yml +++ b/vars/centos.yml @@ -1,2 +1,3 @@ --- ssh_service: sshd +sftp_server: '/usr/libexec/openssh/sftp-server' diff --git a/vars/default.yml b/vars/default.yml index 199a5d8..be9fcea 100644 --- a/vars/default.yml +++ b/vars/default.yml @@ -1,2 +1,3 @@ --- ssh_service: ssh +sftp_server: '/usr/lib/openssh/sftp-server' diff --git a/vars/fedora.yml b/vars/fedora.yml index 164876b..1ccb518 100644 --- a/vars/fedora.yml +++ b/vars/fedora.yml @@ -1,2 +1,3 @@ --- ssh_service: sshd +sftp_server: '/usr/lib/openssh/sftp-server' diff --git a/vars/main.yml b/vars/main.yml index 466d2ee..6dfbb60 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,3 @@ --- -playbook_version_number: 2052 # should be over ninethousand +playbook_version_number: 2053 # should be over ninethousand playbook_version_path: 'role-sshd_chaos-bodensee_github.com.version'