From e96eb79ea4fa0f8714202fd21b23fa0f1da052e5 Mon Sep 17 00:00:00 2001
From: Matthew Evans <git@ml-evs.science>
Date: Sun, 28 Jul 2024 17:10:53 +0100
Subject: [PATCH] Move SSH configs

---
 ansible/roles/datalab/tasks/main.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/datalab/tasks/main.yml b/ansible/roles/datalab/tasks/main.yml
index 264cb23..bdd6537 100644
--- a/ansible/roles/datalab/tasks/main.yml
+++ b/ansible/roles/datalab/tasks/main.yml
@@ -41,8 +41,9 @@
 
 - name: Sync local ssh config vault remote
   ansible.builtin.copy:
-    src: "{{ playbook_dir }}/vaults/datalab/.ssh/"
-    dest: /home/{{ ansible_ssh_user }}/datalab-ssh
+    src: "{{ playbook_dir }}/vaults/datalab/.ssh"
+    dest: /home/{{ ansible_ssh_user }}/.ssh
+    mode: 0700
 
 - name: Create .ssh folder in container
   community.docker.docker_container_exec:
@@ -52,21 +53,21 @@
 - name: Copy SSH config into API container
   community.docker.docker_container_copy_into:
     container: datalab-api-1
-    path: /home/{{ ansible_ssh_user }}/datalab-ssh/config
+    path: /home/{{ ansible_ssh_user }}/.ssh/config
     container_path: /root/.ssh/config
     mode: 0700
 
 - name: Copy SSH public key into API container
   community.docker.docker_container_copy_into:
     container: datalab-api-1
-    path: /home/{{ ansible_ssh_user }}/datalab-ssh/id_ed25519.pub
+    path: /home/{{ ansible_ssh_user }}/.ssh/id_ed25519.pub
     container_path: /root/.ssh/id_ed25519.pub
     mode: 0700
 
 - name: Copy SSH private key into API container
   community.docker.docker_container_copy_into:
     container: datalab-api-1
-    path: /home/{{ ansible_ssh_user }}/datalab-ssh/id_ed25519
+    path: /home/{{ ansible_ssh_user }}/.ssh/id_ed25519
     container_path: /root/.ssh/id_ed25519
     mode: 0700