diff --git a/roles/collab/tasks/main.yml b/roles/collab/tasks/main.yml index 6a51371..64c43b9 100644 --- a/roles/collab/tasks/main.yml +++ b/roles/collab/tasks/main.yml @@ -274,9 +274,7 @@ ansible.builtin.import_role: name: sftpuser vars: - chroot: /srv/wikis/collab - user: backup - publickeys: "{{ backup_publickeys }}" + sftpuser_chroot: /srv/wikis/collab - name: Add backup user to collab group ansible.builtin.user: diff --git a/roles/ldap_server/tasks/main.yml b/roles/ldap_server/tasks/main.yml index 3d9a76e..c36a8ad 100644 --- a/roles/ldap_server/tasks/main.yml +++ b/roles/ldap_server/tasks/main.yml @@ -59,9 +59,7 @@ ansible.builtin.import_role: name: sftpuser vars: - chroot: /srv/backup - user: backup - publickeys: "{{ backup_publickeys }}" + sftpuser_chroot: /srv/backup - name: Create backup directory ansible.builtin.file: diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml index 746da67..13e67cb 100644 --- a/roles/mariadb/tasks/main.yml +++ b/roles/mariadb/tasks/main.yml @@ -100,9 +100,7 @@ ansible.builtin.import_role: name: sftpuser vars: - chroot: /srv/backup - user: backup - publickeys: "{{ backup_publickeys }}" + sftpuser_chroot: /srv/backup - name: Create backup directory ansible.builtin.file: diff --git a/roles/sftpuser/tasks/main.yml b/roles/sftpuser/tasks/main.yml index be66266..e6ef7ab 100644 --- a/roles/sftpuser/tasks/main.yml +++ b/roles/sftpuser/tasks/main.yml @@ -27,7 +27,7 @@ path: /etc/ssh/sshd_config block: | Match User backup - ChrootDirectory {{ chroot }} + ChrootDirectory {{ sftpuser_chroot }} ForceCommand internal-sftp AuthorizedKeysFile /etc/ssh/authorized_keys.backup marker: "# {mark} ANSIBLE MANAGED BLOCK (user backup)"