From e462fb1ffdd9d5d4b263f7e44a8fd3764501d4b4 Mon Sep 17 00:00:00 2001
From: Michele Cereda <cereda.michele@gmail.com>
Date: Tue, 10 May 2022 22:09:20 +0200
Subject: [PATCH] Improved play structure

---
 ansible/keybase.register-device.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ansible/keybase.register-device.yml b/ansible/keybase.register-device.yml
index c1e3c74..b06cebe 100644
--- a/ansible/keybase.register-device.yml
+++ b/ansible/keybase.register-device.yml
@@ -20,6 +20,14 @@
         - keybase_devicename
         - keybase_paperkey
         - keybase_username
+  handlers:
+    - name: Login to Keybase
+      tags: login
+      environment:
+        KEYBASE_DEVICENAME: "{{ keybase_devicename }}"
+        KEYBASE_PAPERKEY: "{{ keybase_paperkey }}"
+        KEYBASE_USERNAME: "{{ keybase_username }}"
+      ansible.builtin.command: "keybase {{ oneshot | ternary('oneshot', 'login -s') }}"
   tasks:
     - name: Install Keybase
       tags:
@@ -72,11 +80,3 @@
         - keybase_user_logged_in.rc != 0
         - keybase_user_logged_in.stderr | regex_search('logged out') is false
         - "keybase_user_logged_in.stdout != '{{ keybase_username }}'"
-  handlers:
-    - name: Login to Keybase
-      tags: login
-      environment:
-        KEYBASE_DEVICENAME: "{{ keybase_devicename }}"
-        KEYBASE_PAPERKEY: "{{ keybase_paperkey }}"
-        KEYBASE_USERNAME: "{{ keybase_username }}"
-      ansible.builtin.command: "keybase {{ oneshot | ternary('oneshot', 'login') }}"