deployment QoL

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index c0e7f23f28a118c8b5c6fe144c4d567bcf74015b..49b959d7364e33d1af44662d35a37ac1aff3cc02 100755 (executable)
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -7,6 +7,6 @@ source "${HOME}/.virtualenvs/ansible/bin/activate"
 
 export ANSIBLE_VAULT_PASSWORD_FILE=vault.sh
 
-ansible-playbook -i hosts deploy.yml -D
+ansible-playbook -i hosts deploy.yml -D $*
 
 popd || exit

diff --git a/deploy/deploy.yml b/deploy/deploy.yml
index 2ba3173981017d5ec9b30335bd46c888305e9415..fb39a0b56de9a3501627caee8379c0573bda7bf2 100644 (file)
--- a/deploy/deploy.yml
+++ b/deploy/deploy.yml
@@ -9,7 +9,10 @@
       comment: "Account for the urlbot"
       shell: /bin/bash
   - name: local user can log in with ssh key
-    authorized_key: user=jabberbot key="{{ lookup('file', '~/.ssh/id_rsa.pub') }}"
+    authorized_key: user=jabberbot key="{{ lookup('file', item) }}"
+    with_fileglob:
+    - "~/.ssh/*.pub"
+
   - name: ensure venv module is installed
     apt:
       name: python3-venv