Fix variable deprecations and split site.yml into system and user plays
Replace deprecated ansible_user_dir/ansible_user_id with ansible_facts['user_dir'/'user_id'] across all roles. Switch git repo URLs from HTTPS to SSH. Split site.yml into two plays so user-facing roles (dotfiles, scripts, hotkeys) run without become.
This commit is contained in:
@@ -14,6 +14,6 @@
|
||||
|
||||
- name: Add user to docker group
|
||||
ansible.builtin.user:
|
||||
user: "{{ ansible_user_id }}"
|
||||
user: "{{ ansible_facts['user_id'] }}"
|
||||
groups: docker
|
||||
append: true
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
---
|
||||
- name: Clone dot files repo
|
||||
ansible.builtin.git:
|
||||
repo: https://gitea.learningunix.net/cjr/dotfiles.git
|
||||
dest: "{{ ansible_user_dir }}/dotfiles"
|
||||
repo: git@gitea.learningunix.net:cjr/dotfiles.git
|
||||
dest: "{{ ansible_facts['user_dir'] }}/dotfiles"
|
||||
update: true
|
||||
version: main
|
||||
|
||||
- name: Clone the nvim repo
|
||||
ansible.builtin.git:
|
||||
repo: https://gitea.learningunix.net/cjr/vim.git
|
||||
dest: "{{ ansible_user_dir }}/nvim"
|
||||
repo: git@gitea.learningunix.net:cjr/vim.git
|
||||
dest: "{{ ansible_facts['user_dir'] }}/nvim"
|
||||
update: true
|
||||
version: main
|
||||
|
||||
- name: Symlink .zshrc
|
||||
ansible.builtin.file:
|
||||
src: "{{ ansible_user_dir }}/dotfiles/zsh/.zshrc"
|
||||
dest: "{{ ansible_user_dir }}/.zshrc"
|
||||
src: "{{ ansible_facts['user_dir'] }}/dotfiles/zsh/.zshrc"
|
||||
dest: "{{ ansible_facts['user_dir'] }}/.zshrc"
|
||||
state: link
|
||||
force: true
|
||||
|
||||
- name: Symlink nvim config
|
||||
ansible.builtin.file:
|
||||
src: "{{ ansible_user_dir }}/nvim"
|
||||
dest: "{{ ansible_user_dir }}/.config/nvim"
|
||||
src: "{{ ansible_facts['user_dir'] }}/nvim"
|
||||
dest: "{{ ansible_facts['user_dir'] }}/.config/nvim"
|
||||
state: link
|
||||
force: true
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
- name: Copy cheat sheet desktop file
|
||||
ansible.builtin.template:
|
||||
src: cheat-sheet.desktop.j2
|
||||
dest: "{{ ansible_user_dir }}/.local/share/applications/net.local.cheat-sheet.sh.desktop"
|
||||
dest: "{{ ansible_facts['user_dir'] }}/.local/share/applications/net.local.cheat-sheet.sh.desktop"
|
||||
mode: "0644"
|
||||
|
||||
- name: Copy password script
|
||||
ansible.builtin.template:
|
||||
src: pass-menu.desktop.j2
|
||||
dest: "{{ ansible_user_dir }}/.local/share/applications/net.local.pass-menu.sh.desktop"
|
||||
dest: "{{ ansible_facts['user_dir'] }}/.local/share/applications/net.local.pass-menu.sh.desktop"
|
||||
mode: "0644"
|
||||
|
||||
- name: Set cheat-sheet hotkey
|
||||
community.general.ini_file:
|
||||
path: "{{ ansible_user_dir }}/.config/kglobalshortcutsrc"
|
||||
path: "{{ ansible_facts['user_dir'] }}/.config/kglobalshortcutsrc"
|
||||
section: "services][net.local.cheat-sheet.sh.desktop"
|
||||
option: _launch
|
||||
value: Alt+C
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
- name: Set pass-menu hotkey
|
||||
community.general.ini_file:
|
||||
path: "{{ ansible_user_dir }}/.config/kglobalshortcutsrc"
|
||||
path: "{{ ansible_facts['user_dir'] }}/.config/kglobalshortcutsrc"
|
||||
section: "services][net.local.pass-menu.sh.desktop"
|
||||
option: _launch
|
||||
value: Alt+P
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[Desktop Entry]
|
||||
Exec={{ ansible_user_dir }}/scripts/cheat-sheet.sh
|
||||
Exec={{ ansible_facts['user_dir'] }}/scripts/cheat-sheet.sh
|
||||
Name=cheat-sheet
|
||||
NoDisplay=true
|
||||
StartupNotify=false
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[Desktop Entry]
|
||||
Exec={{ ansible_user_dir }}/scripts/pass-menu.sh
|
||||
Exec={{ ansible_facts['user_dir'] }}/scripts/pass-menu.sh
|
||||
Name=pass-menu
|
||||
NoDisplay=true
|
||||
StartupNotify=false
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
---
|
||||
- name: Clone the scripts repo
|
||||
ansible.builtin.git:
|
||||
repo: https://gitea.learningunix.net/cjr/scripts
|
||||
dest: "{{ ansible_user_dir }}/scripts"
|
||||
repo: git@gitea.learningunix.net:cjr/scripts.git
|
||||
dest: "{{ ansible_facts['user_dir'] }}/scripts"
|
||||
update: true
|
||||
version: main
|
||||
|
||||
- name: Ensure that scripts is in the user's path
|
||||
ansible.builtin.lineinfile:
|
||||
path: "{{ ansible_user_dir }}/dotfiles/zsh/.zshrc"
|
||||
path: "{{ ansible_facts['user_dir'] }}/dotfiles/zsh/.zshrc"
|
||||
line: 'export PATH="$HOME/scripts:$PATH"'
|
||||
state: present
|
||||
|
||||
@@ -15,6 +15,6 @@
|
||||
|
||||
- name: Add user to libvirt group
|
||||
ansible.builtin.user:
|
||||
name: "{{ ansible_user_id }}"
|
||||
name: "{{ ansible_facts['user_id'] }}"
|
||||
groups: libvirt
|
||||
append: true
|
||||
|
||||
Reference in New Issue
Block a user