diff --git a/deployment/jailhost.py b/deployment/jailhost.py index be2cb821..d82b5b07 100644 --- a/deployment/jailhost.py +++ b/deployment/jailhost.py @@ -80,4 +80,4 @@ def reset_jails(confirm=True, keep_cleanser_master=True): for jail in jails: fab.run('ezjail-admin delete -fw {jail}'.format(jail=jail)) # remove authorized keys for no longer existing key (they are regenerated for each new worker) - fab.run('rm /usr/jails/cleanser/usr/home/cleanser/.ssh/authorized_keys') + fab.run('rm /usr/jails/cleanser/home/cleanser/.ssh/authorized_keys') diff --git a/deployment/main.yml b/deployment/main.yml index 0e2803be..286e8178 100644 --- a/deployment/main.yml +++ b/deployment/main.yml @@ -53,7 +53,7 @@ createhome: yes - name: create cleanser .ssh file: - path: /usr/home/cleanser/.ssh + path: /home/cleanser/.ssh owner: cleanser mode: "700" state: directory @@ -73,12 +73,12 @@ tags: cleanser_clones # grant worker's pyramid user ssh access - name: copy keyfile - command: cp {{ jails_dir }}/worker/home/pyramid/.ssh/id_rsa.pub {{ jails_dir }}/cleanser/usr/home/cleanser/.ssh/authorized_keys + command: cp {{ jails_dir }}/worker/home/pyramid/.ssh/id_rsa.pub {{ jails_dir }}/cleanser/home/cleanser/.ssh/authorized_keys args: - creates: "{{ jails_dir }}/cleanser/usr/home/cleanser/.ssh/authorized_keys" + creates: "{{ jails_dir }}/cleanser/home/cleanser/.ssh/authorized_keys" tags: cleanser_clones - name: fix permissions on keyfile - command: chmod 600 {{ jails_dir }}/cleanser/usr/home/cleanser/.ssh/authorized_keys + command: chmod 600 {{ jails_dir }}/cleanser/home/cleanser/.ssh/authorized_keys tags: cleanser_clones - name: read ssh pub host key shell: sed -E -e 's:[^ ]+$::' {{ jails_dir }}/cleanser/etc/ssh/ssh_host_rsa_key.pub @@ -103,7 +103,7 @@ user: root tasks: - name: ensure ownership of scripts - command: chown -R cleanser /usr/home/cleanser + command: chown -R cleanser /home/cleanser tags: cleanser_clones - name: Upload cleanser scripts copy: