From 8d4ef1a461bf566e1c336a3e510e4835f758bd43 Mon Sep 17 00:00:00 2001
From: Alex Tavarez <admin@sukaato.moe>
Date: Tue, 21 Oct 2025 14:05:51 -0400
Subject: [PATCH] Changed source path for files moved into lockdown role that
 are used in copy module tasks

---
 .ansible/roles/lockdown/tasks/git.yml |  4 ++--
 .ansible/roles/lockdown/tasks/gpg.yml |  2 +-
 playbooks/init_login.yml              | 15 ++++++---------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.ansible/roles/lockdown/tasks/git.yml b/.ansible/roles/lockdown/tasks/git.yml
index 98e4676..4794c1e 100644
--- a/.ansible/roles/lockdown/tasks/git.yml
+++ b/.ansible/roles/lockdown/tasks/git.yml
@@ -88,7 +88,7 @@
     block:
       - name: Transfer private SSH keys
         ansible.builtin.copy:
-          src: ssh/{{ item }}.ppk
+          src: ssh/{{ ansible_facts['user_id'] }}/{{ item }}.ppk
           dest: "{{ ansible_facts['user_dir'] }}/.ssh/{{ item }}.ppk"
           force: yes
           backup: yes
@@ -100,7 +100,7 @@
         register: created_ssh_private_keys
       - name: Transfer public SSH keys
         ansible.builtin.copy:
-          src: ssh/{{ item }}.pub
+          src: ssh/{{ ansible_facts['user_id'] }}/{{ item }}.pub
           dest: "{{ ansible_facts['user_dir'] }}/.ssh/{{ item }}.pub"
           force: yes
           backup: yes
diff --git a/.ansible/roles/lockdown/tasks/gpg.yml b/.ansible/roles/lockdown/tasks/gpg.yml
index 84156e2..f206e9c 100644
--- a/.ansible/roles/lockdown/tasks/gpg.yml
+++ b/.ansible/roles/lockdown/tasks/gpg.yml
@@ -27,7 +27,7 @@
 - name: Acquire GPG private keys
   when: files_mode
   ansible.builtin.copy:
-    src: gnupg/{{ item }}.asc
+    src: gnupg/{{ ansible_facts['user_id'] }}/{{ item }}.asc
     dest: "{{ ansible_facts['user_dir'] }}/.gnupg/{{ item }}.priv.asc"
     force: yes
     backup: yes
diff --git a/playbooks/init_login.yml b/playbooks/init_login.yml
index fb57438..cd2d526 100644
--- a/playbooks/init_login.yml
+++ b/playbooks/init_login.yml
@@ -7,14 +7,11 @@
     - vars/ssh_keys.yml
   vars:
     ansible_user: "{{ passwords[0].username }}"
-    ansible_ssh_user: "{{ passwords[0].username }}"
     # @NOTE one of below two lines should be commented/uncommented in a mutually exclusive fashion
     # ansible_ssh_private_key_file: "{{ chosen_native_ssh_private_key_file | default(chosen_local_ssh_private_key_file, true) }}" # @NOTE only works with soft-coded SSH key list building
-    ansible_ssh_private_key_file: "{{ chosen_local_ssh_private_key_file }}"
+    ansible_ssh_private_key_file: "{{ chosen_local_ssh_private_key_file }}" # @NOTE references an inventory / group variable
     # @NOTE below three lines should only be uncommented when above two are commented and vice versa; key-based authentication should have already been enabled prior to running this playbook
     # ansible_password: "{{ passwords[0].password }}"
-    # ansible_ssh_pass: "{{ passwords[0].username }}"
-    # ansible_ssh_password: "{{ passwords[0].username }}"
     ansible_python_interpreter: “{{ ansible_playbook_python }}”
     personal_computers: locals # @NOTE can change to *_households group or {{ name }}_{{ surname }} group name
   vars_prompt:
@@ -43,7 +40,7 @@
     - name: Create global bash aliases
       become: yes
       ansible.builtin.copy:
-        src: files/all/bash/bash_aliases
+        src: bash/bash_aliases
         dest: /etc/bash_aliases
         owner: root
         group: root
@@ -58,7 +55,7 @@
     - name: Create global bash functions
       become: yes
       ansible.builtin.copy:
-        src: files/all/bash/bash_functions
+        src: bash/bash_functions
         dest: /etc/bash_functions
         owner: root
         group: root
@@ -110,7 +107,7 @@
             state: present
         - name: Create XDG user home directory environment variables
           ansible.builtin.copy:
-            src: "files/servers/{{ ansible_facts['user_id'] }}/xdg/user-dirs.dirs"
+            src: "xdg/{{ ansible_facts['user_id'] }}/user-dirs.dirs"
             dest: "{{ ansible_facts['user_dir'] }}/.config/user-dirs.dirs"
             owner: root
             group: root
@@ -140,7 +137,7 @@
             state: present
         - name: Create XDG user home directory environment variables
           ansible.builtin.copy:
-            src: "files/locals/{{ ansible_facts['user_id'] }}/xdg/user-dirs.dirs"
+            src: "xdg/{{ ansible_facts['user_id'] }}/user-dirs.dirs"
             dest: "{{ ansible_facts['user_dir'] }}/.config/user-dirs.dirs"
             owner: root
             group: root
@@ -159,7 +156,7 @@
       block:
         - name: Create user SSH configuration
           ansible.builtin.copy:
-            src: "files/locals/ssh/{{ ansible_facts['user_id'] }}/config"
+            src: "ssh/{{ ansible_facts['user_id'] }}/config"
             dest: "{{ ansible_facts['user_dir'] }}/.ssh/config"
             follow: yes
             force: yes