Skip to content

Commit

Permalink
Remove v3 onion secrets when transitioning to ssh over local
Browse files Browse the repository at this point in the history
- v2 aths secret file pattern does not match the one for v3
- Use async task for reboot for more immediate feedback
- Instruct admin to run tailsconfig to update the ssh config on tails workstation
  • Loading branch information
emkll committed Sep 11, 2019
1 parent ff31133 commit 2dc29cd
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions install_files/ansible-base/tasks/transistion_ssh_local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- "{{ playbook_dir }}"
patterns:
- '*ssh-aths'
- '*ssh.auth_private'
register: find_ssh_aths_result

- name: Delete any aths ssh files found
Expand All @@ -20,13 +21,15 @@
run_once: yes

- name: Force a reboot conditionally, when tor_over_ssh status changed
command: shutdown -r now
shell: sleep 2 && shutdown -r now
async: 1
poll: 0
when: aths_deletion_results|changed

- name: Provide helpful user message and end early
fail:
msg: |
Due to the transition from ssh-over-tor to ssh-over-localnet
please re-run `./securedrop-admin install` again to continue
re-configuration.
please run `./securedrop-admin tailsconfig` and then re-run
`./securedrop-admin install` again to continue re-configuration.
when: aths_deletion_results|changed

0 comments on commit 2dc29cd

Please sign in to comment.