update..

2025-10-27 23:17:40 +01:00
parent cfcd9c84ff
commit 8a4da8c615
8 changed files with 483 additions and 293 deletions
--- a/roles/common/tasks/nis-user-systemfiles.yml
+++ b/roles/common/tasks/nis-user-systemfiles.yml
@@ -51,37 +51,36 @@
  tags:
    - profile

- name: (nis-user-systemfiles.yml) copy .profile if it exists
-  copy:
-    src: "{{ lookup('fileglob', inventory_dir + '/files/' + nis_domain + '/homedirs/' + item.item.name + '/_profile') }}"
-    dest: "~{{ item.item.name }}/.profile"
-    owner: "{{ item.item.name }}"
-    group: "{{ item.item.name }}"
-    mode: 0644
-  loop: "{{  local_template_dir_nis_user.results }}"
-  loop_control:
-    label: '{{ item.item.name }}'
-  when:
-    - item.stat.exists
-    - lookup('fileglob', inventory_dir + '/files/' + nis_domain + '/homedirs/' + item.item.name + '/_profile')
-  tags:
-    - profile

- name: (nis-user-systemfiles.yml) copy default .profile if it exists
-  template:
-    src: "{{ lookup('fileglob', inventory_dir + '/files/' + nis_domain + '/homedirs/DEFAULT/_profile.j2') }}"
-    dest: "~{{ item.item.name }}/.profile"
-    owner: "{{ item.item.name }}"
-    group: "{{ item.item.name }}"
-    mode: 0644
-  loop: "{{ local_template_dir_nis_user.results }}"
+# 1) Für jeden NIS-User prüfen, ob eine lokale _profile existiert
+- name: (nis-user-systemfiles.yml) stat user _profile
+  ansible.builtin.stat:
+    path: "{{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ item.name }}/_profile"
+  delegate_to: localhost
+  become: false
+  loop: "{{ nis_user }}"
+  register: profile_stats
  loop_control:
-    label: '{{ item.item.name }}'
-  when:
-    - item.stat.exists == false
-    - lookup('fileglob', inventory_dir + '/files/' + nis_domain + '/homedirs/DEFAULT/_profile.j2')
-  tags:
-    - profile
+    label: "{{ item.name }}"
+
+# 2) Falls NIS-User _profile vorhanden, kopieren
+- name: (nis-user-systemfiles.yml) copy .profile if it exists
+  ansible.builtin.copy:
+    src: "{{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ user.name }}/_profile"
+    dest: "~{{ user.name }}/.profile"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
+    mode: "0644"
+  become: true
+  loop: "{{ nis_user | zip(profile_stats.results) | list }}"
+  loop_control:
+    label: "{{ user.name }}"
+  when: 
+    - stat_result.stat.exists | bool
+  vars:
+    user: "{{ item.0 }}" 
+    stat_result: "{{ item.1 }}"
+  tags: [bash]


 # --
@@ -107,92 +106,118 @@
  tags:
    - bashrc

- name: (nis-user-systemfiles.yml) copy .bashrc if it exists
-  copy:
-    src: "{{ lookup('fileglob', inventory_dir + '/files/' + nis_domain + '/homedirs/' + item.item.name + '/_bashrc') }}"
-    dest: "~{{ item.item.name }}/.bashrc"
-    owner: "{{ item.item.name }}"
-    group: "{{ item.item.name }}"
-    mode: 0644
-  loop: "{{ local_template_dir_nis_user.results }}"
+# 1) Für jeden NIS-User prüfen, ob eine lokale _bashrc existiert
+- name: (system-user-systemfiles.yml) stat user _bashrc
+  ansible.builtin.stat:
+    path: "{{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ item.name }}/_bashrc"
+  delegate_to: localhost
+  become: false
+  loop: "{{ nis_user }}"
+  register: bashrc_stats
  loop_control:
-    label: '{{ item.item.name }}'
-  when:
-    - item.stat.exists
-    - lookup('fileglob', inventory_dir + '/files/' + nis_domain + '/homedirs/' + item.item.name + '/_bashrc')
-  tags:
-    - bashrc
+    label: "{{ item.name }}"

- name: (nis-user-systemfiles.yml) copy default .bashrc if it exists
-  copy:
-    src: "{{ 'files/' + nis_domain + '/homedirs/DEFAULT/_bashrc' }}"
-    dest: "~{{ item.item.name }}/.bashrc"
-    owner: "{{ item.item.name }}"
-    group: "{{ item.item.name }}"
-    mode: 0644
-  loop: "{{ local_template_dir_nis_user.results }}"
+# 2) Falls User _bashrc vorhanden, kopieren
+- name: (system-user-systemfiles.yml) copy .bashrc if it exists
+  ansible.builtin.copy:
+    src: "{{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ user.name }}/_bashrc"
+    dest: "~{{ user.name }}/.bashrc"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
+    mode: "0644"
+  become: true
+  loop: "{{ nis_user | zip(bashrc_stats.results) | list }}"
  loop_control:
-    label: '{{ item.item.name }}'
+    label: "{{ user.name }}"
  when:
-    - item.stat.exists == false
-  tags:
-    - bashrc
+    - stat_result.stat.exists | bool
+  vars:
+    user: "{{ item.0 }}"
+    stat_result: "{{ item.1 }}"
+  tags: [bash]


 # --
 # Copy .vimrc
 # ---

- name: (nis-user-systemfiles.yml) copy .vimrc if it exists
-  copy:
-    src: "{{ lookup('fileglob', inventory_dir + '/files/homedirs/' + item.item.name + '/_vimrc') }}"
-    dest: "~{{ item.item.name }}/.vimrc"
-    owner: "{{ item.item.name }}"
-    group: "{{ item.item.name }}"
-    mode: 0644
-  loop: "{{ local_template_dir_nis_user.results }}"
-  loop_control:
-    label: '{{ item.item.name }}'
-  when:
-    - item.stat.exists
-    - lookup('fileglob', inventory_dir + '/files/homedirs/' + item.item.name + '/_vimrc')
-  tags:
-    - vimrc
-
- name: (nis-user-systemfiles.yml) Check if .vim directory exists for default users
-  local_action: stat path={{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ item.name }}/.vim
-  with_items: "{{ nis_user }}"
+# 1. Prüfen, ob für jeden User ein lokales _vimrc existiert
+- name: (system-user-systemfiles.yml) stat user _vimrc
+  ansible.builtin.stat:
+    path: "{{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ item.name }}/_vimrc"
+  delegate_to: localhost
+  become: false
+  loop: "{{ nis_user }}"
+  register: vimrc_stats
  loop_control:
    label: '{{ item.name }}'
-  register: local_template_dir_dotvim_default_user

- name: (nis-user-systemfiles.yml) copy .vim directory if it exists
-  copy:
-    src: "{{ inventory_dir + '/files/' + nis_domain + '/homedirs/' + item.item.name + '/.vim' }}"
-    dest: "~{{ item.item.name }}"
-    owner: "{{ item.item.name }}"
-    group: "{{ item.item.name }}"
-    mode: 0644
-  with_items: "{{ local_template_dir_dotvim_default_user.results }}"
+# 2. Falls vorhanden, Datei kopieren
+- name: (system-user-systemfiles.yml) copy .vimrc if it exists
+  ansible.builtin.copy:
+    src: "{{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ user.name }}/_vimrc"
+    dest: "~{{ user.name }}/.vimrc"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
+    mode: '0644'
+  loop: "{{ nis_user | zip(vimrc_stats.results) | list }}"
  loop_control:
-    label: '{{ item.item.name }}'
+    label: "{{ user.name }}"
  when:
-    - item.stat.exists
+    - stat_result.stat.exists
+  vars:
+    user: "{{ item.0 }}"
+    stat_result: "{{ item.1 }}"
  tags:
-    - vimrc
+    - bash

- name: (nis-user-systemfiles.yml) copy default .vimrc if it exists
-  copy:
-    src: "{{ 'files/' + nis_domain + '/homedirs/DEFAULT/_vimrc' }}"
-    dest: "~{{ item.item.name }}/.vimrc"
-    owner: "{{ item.item.name }}"
-    group: "{{ item.item.name }}"
-    mode: 0644
-  loop: "{{ local_template_dir_nis_user.results }}"
+
+# 1) Lokal prüfen, ob ~/.vim existiert
+- name: (system-user-systemfiles.yml) stat local .vim for each user
+  ansible.builtin.stat:
+    path: "{{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ item.name }}/.vim"
+  delegate_to: localhost
+  become: false
+  loop: "{{ nis_user }}"
+  register: dotvim_stats
  loop_control:
-    label: '{{ item.item.name }}'
-  when:
-    - item.stat.exists == false
-  tags:
-    - vimrc
+    label: "{{ item.name }}"
+
+# 2) Wenn vorhanden, .vim-Verzeichnis ins Home des Users kopieren
+- name: (system-user-systemfiles.yml) copy .vim directory if it exists
+  ansible.builtin.copy:
+    # Wichtig: KEINE verschachtelten {{ ... }} im String
+    src: "{{ inventory_dir }}/files/{{ nis_domain }}/homedirs/{{ user.name }}/.vim"
+    dest: "~{{ user.name }}/"
+    mode: preserve           # oder weglassen; 0644 wäre für Verzeichnisse falsch
+  become: true
+  loop: "{{ nis_user | zip(dotvim_stats.results) | list }}"
+  loop_control:
+    label: "{{ user.name }}"
+  when:
+    - stat_result.stat.exists | bool
+  vars:
+    user: "{{ item.0 }}"
+    stat_result: "{{ item.1 }}"
+  tags: [vim]
+
+
+# 3) Ownership/Gruppe rekursiv korrigieren (falls gewünscht/erforderlich)
+- name: (system-user-systemfiles.yml) ensure ownership on ~/.vim recursively
+  ansible.builtin.file:
+    path: "~{{ user.name }}/.vim"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
+    recurse: true
+    state: directory
+  become: true
+  loop: "{{ nis_user | zip(dotvim_stats.results) | list }}"
+  loop_control:
+    label: "{{ user.name }}"
+  when:
+    - stat_result.stat.exists | bool
+  vars:
+    user: "{{ item.0 }}"
+    stat_result: "{{ item.1 }}"
+  tags: [vim]