From 6e4fffbe9d793263c2274c932ab45d0f994c5432 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 27 Oct 2022 00:22:06 -0400 Subject: [PATCH] Specify git config on a per-user basis. --- ansible/environments/laptop/host_vars/odofreebsd | 2 +- ansible/environments/laptop/host_vars/odolinux | 2 +- ansible/roles/base/files/gitconfig_home | 2 +- ansible/roles/base/tasks/peruser.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd index 4149cfa..6436a21 100644 --- a/ansible/environments/laptop/host_vars/odofreebsd +++ b/ansible/environments/laptop/host_vars/odofreebsd @@ -31,4 +31,4 @@ users: - main_fido - backup_fido - homeassistant -gitconfig: gitconfig_home + gitconfig: "gitconfig_home" diff --git a/ansible/environments/laptop/host_vars/odolinux b/ansible/environments/laptop/host_vars/odolinux index 267767c..c942d40 100644 --- a/ansible/environments/laptop/host_vars/odolinux +++ b/ansible/environments/laptop/host_vars/odolinux @@ -14,6 +14,7 @@ users: - main_fido - backup_fido - homeassistant + gitconfig: "gitconfig_home" zfs_snapshot_datasets: - zroot/linux/archmain/home - zroot/linux/archmain/be @@ -21,4 +22,3 @@ graphics_driver: "intel" build_user: name: talexander group: talexander -gitconfig: gitconfig_home diff --git a/ansible/roles/base/files/gitconfig_home b/ansible/roles/base/files/gitconfig_home index 8e4b8dd..263f2f6 100644 --- a/ansible/roles/base/files/gitconfig_home +++ b/ansible/roles/base/files/gitconfig_home @@ -8,7 +8,7 @@ lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit bh = log --oneline --branches=* --remotes=* --graph --decorate [core] - excludesfile = /home/talexander/.gitignore_global + excludesfile = ~/.gitignore_global [commit] gpgsign = true [pull] diff --git a/ansible/roles/base/tasks/peruser.yaml b/ansible/roles/base/tasks/peruser.yaml index 183ff7a..4595d8f 100644 --- a/ansible/roles/base/tasks/peruser.yaml +++ b/ansible/roles/base/tasks/peruser.yaml @@ -8,9 +8,9 @@ mode: 0600 owner: "{{ account_name.stdout }}" group: "{{ group_name.stdout }}" - when: gitconfig is defined + when: "users[account_name.stdout].gitconfig is defined" loop: - - src: "{{ gitconfig }}" + - src: "{{ users[account_name.stdout].gitconfig }}" dest: .gitconfig - name: Copy files