Make server profile user configurable

ansible/inventory/group_vars/all.yml

@@ -4,6 +4,9 @@ username: fscotto
 user_group: fscotto
 user_home: "/home/{{ username }}"
 user_shell: /bin/bash
+effective_username: "{{ username }}"
+effective_user_group: "{{ user_group }}"
+effective_user_home: "{{ user_home }}"
 
 xdg_user_directories:
   - Desktop

ansible/inventory/group_vars/server.yml

@@ -1,4 +1,11 @@
 ---
+server_username: "{{ username }}"
+server_user_group: "{{ server_username }}"
+server_user_home: "/home/{{ server_username }}"
+effective_username: "{{ server_username }}"
+effective_user_group: "{{ server_user_group }}"
+effective_user_home: "{{ server_user_home }}"
+
 profile_packages:
   - avahi-daemon
   - dmidecode
@@ -35,4 +42,4 @@ server_sshd_settings:
   PermitRootLogin: "no"
 
 server_sshd_allow_users:
-  - "{{ username }}"
+  - "{{ server_username }}"

ansible/roles/dotfiles_common/tasks/main.yml

@@ -8,10 +8,10 @@
 - name: Ensure XDG user directories exist
   tags: [dotfiles, dotfiles:common]
   ansible.builtin.file:
-    path: "{{ user_home }}/{{ item }}"
+    path: "{{ effective_user_home }}/{{ item }}"
     state: directory
-    owner: "{{ username }}"
-    group: "{{ user_group }}"
+    owner: "{{ effective_username }}"
+    group: "{{ effective_user_group }}"
     mode: "0755"
   loop: "{{ xdg_user_directories | default([]) }}"
 
@@ -19,9 +19,9 @@
   tags: [dotfiles, dotfiles:common]
   ansible.builtin.copy:
     src: "{{ playbook_dir }}/../dotfiles/common/{{ item.src }}"
-    dest: "{{ user_home }}/{{ item.dest }}"
-    owner: "{{ username }}"
-    group: "{{ user_group }}"
+    dest: "{{ effective_user_home }}/{{ item.dest }}"
+    owner: "{{ effective_username }}"
+    group: "{{ effective_user_group }}"
     mode: "{{ item.mode }}"
   loop: "{{ common_dotfiles | default([]) }}"
   loop_control:
@@ -31,7 +31,7 @@
   tags: [dotfiles, dotfiles:common]
   ansible.builtin.command:
     cmd: "{{ 'batcat' if ansible_facts.os_family == 'Debian' else 'bat' }} cache --build"
-  become_user: "{{ username }}"
+  become_user: "{{ effective_username }}"
   environment:
-    HOME: "{{ user_home }}"
+    HOME: "{{ effective_user_home }}"
   changed_when: false

ansible/roles/packages_ubuntu/tasks/main.yml

@@ -202,7 +202,7 @@
 - name: Add user to docker group
   tags: [packages]
   ansible.builtin.user:
-    name: "{{ username }}"
+    name: "{{ effective_username }}"
     groups: docker
     append: true
   when: (ubuntu_docker_packages | default([])) | length > 0

ansible/roles/profile_server/tasks/main.yml

@@ -4,9 +4,9 @@
   tags: [dotfiles, dotfiles:server]
   ansible.builtin.copy:
     src: "{{ playbook_dir }}/../dotfiles/server/{{ item.src }}"
-    dest: "{{ user_home }}/{{ item.dest }}"
-    owner: "{{ username }}"
-    group: "{{ user_group }}"
+    dest: "{{ server_user_home }}/{{ item.dest }}"
+    owner: "{{ server_username }}"
+    group: "{{ server_user_group }}"
     mode: "{{ item.mode }}"
   loop: "{{ server_dotfiles | default([]) }}"
   loop_control:
@@ -16,9 +16,9 @@
   tags: [dotfiles, dotfiles:server]
   ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ user_home }}/{{ item.dest }}"
-    owner: "{{ username }}"
-    group: "{{ user_group }}"
+    dest: "{{ server_user_home }}/{{ item.dest }}"
+    owner: "{{ server_username }}"
+    group: "{{ server_user_group }}"
     mode: "{{ item.mode }}"
   loop: "{{ server_templates | default([]) }}"
   loop_control: