ansible/oopen-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(sshd_config.j2): update condition for SFTP subsystem configuration to use common variable

Browse Source
This commit is contained in:
Christoph
2026-07-30 01:38:49 +02:00
parent 1c1ae9464c
commit ca02faf748
2 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/common/tasks/users-systemfiles.yml
+65 -47
View File
@@ -6,11 +6,12 @@
# default_users
- name: (users-systemfiles.yml) Check if local template directory exists for default users
ansible.builtin.stat:
path: "{{ inventory_dir }}/files/homedirs/{{ item.name }}"
path: "{{ inventory_dir }}/files/homedirs/{{ user.name }}"
delegate_to: localhost
with_items: "{{ default_user }}"
loop: "{{ default_user }}"
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
register: common_local_template_dir_default_user
# root
@@ -26,34 +27,37 @@
- name: (users-systemfiles.yml) Check if users file '.bashrc.ORIG' exists
ansible.builtin.stat:
path: "~{{ item.name }}/.bashrc.ORIG"
path: "~{{ user.name }}/.bashrc.ORIG"
register: common_bashrc_user_orig_exists
loop: "{{ default_user }}"
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
tags:
- bash
- name: (users-systemfiles.yml) Backup existing users .bashrc file
ansible.builtin.command:
cmd: cp -a ~{{ item.item.name }}/.bashrc ~{{ item.item.name }}/.bashrc.ORIG
creates: "~{{ item.item.name }}/.bashrc.ORIG"
loop: "{{ common_bashrc_user_orig_exists.results }}"
cmd: cp -a ~{{ user_pair.0.name }}/.bashrc ~{{ user_pair.0.name }}/.bashrc.ORIG
creates: "~{{ user_pair.0.name }}/.bashrc.ORIG"
loop: "{{ default_user | zip(common_bashrc_user_orig_exists.results) | list }}"
loop_control:
label: "{{ item.item.name }}"
loop_var: user_pair
label: "{{ user_pair.0.name }}"
tags:
- bash
# 1. Prüfen, ob für jeden User ein lokales _bashrc existiert
- name: (users-systemfiles.yml) stat user _bashrc
ansible.builtin.stat:
path: "{{ inventory_dir }}/files/homedirs/{{ item.name }}/_bashrc"
path: "{{ inventory_dir }}/files/homedirs/{{ user.name }}/_bashrc"
delegate_to: localhost
become: false
loop: "{{ default_user }}"
register: common_bashrc_stats
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
# 2. Falls vorhanden, Datei kopieren
- name: (users-systemfiles.yml) copy .bashrc if it exists
@@ -65,12 +69,13 @@
mode: "0644"
loop: "{{ default_user | zip(common_bashrc_stats.results) | list }}"
loop_control:
loop_var: user_stat
label: "{{ user.name }}"
when:
- stat_result.stat.exists
vars:
user: "{{ item.0 }}"
stat_result: "{{ item.1 }}"
user: "{{ user_stat.0 }}"
stat_result: "{{ user_stat.1 }}"
tags:
- bash
@@ -119,11 +124,12 @@
- name: (users-systemfiles.yml) Check if users file '.profile.ORIG' exists
ansible.builtin.stat:
path: "~{{ item.name }}/.profile.ORIG"
path: "~{{ user.name }}/.profile.ORIG"
register: common_profile_user_orig_exists
loop: "{{ default_user }}"
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
when:
- ansible_facts['distribution'] == "Debian"
tags:
@@ -131,11 +137,12 @@
- name: (users-systemfiles.yml) Backup existing users .profile file
ansible.builtin.command:
cmd: cp -a ~{{ item.item.name }}/.profile ~{{ item.item.name }}/.profile.ORIG
creates: "~{{ item.item.name }}/.profile.ORIG"
loop: "{{ common_profile_user_orig_exists.results }}"
cmd: cp -a ~{{ user_pair.0.name }}/.profile ~{{ user_pair.0.name }}/.profile.ORIG
creates: "~{{ user_pair.0.name }}/.profile.ORIG"
loop: "{{ default_user | zip(common_profile_user_orig_exists.results) | list }}"
loop_control:
label: "{{ item.item.name }}"
loop_var: user_pair
label: "{{ user_pair.0.name }}"
when:
- ansible_facts['distribution'] == "Debian"
tags:
@@ -144,13 +151,14 @@
# 1. Prüfen, ob für jeden User ein lokales _profile existiert
- name: (users-systemfiles.yml) stat user _profile
ansible.builtin.stat:
path: "{{ inventory_dir }}/files/homedirs/{{ item.name }}/_profile"
path: "{{ inventory_dir }}/files/homedirs/{{ user.name }}/_profile"
delegate_to: localhost
become: false
loop: "{{ default_user }}"
register: common_profile_stats
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
# 2. Falls vorhanden, Datei kopieren
- name: (users-systemfiles.yml) copy .profile if it exists
@@ -162,12 +170,13 @@
mode: "0644"
loop: "{{ default_user | zip(common_profile_stats.results) | list }}"
loop_control:
loop_var: user_stat
label: "{{ user.name }}"
when:
- stat_result.stat.exists
vars:
user: "{{ item.0 }}"
stat_result: "{{ item.1 }}"
user: "{{ user_stat.0 }}"
stat_result: "{{ user_stat.1 }}"
tags:
- bash
@@ -220,11 +229,12 @@
- name: (users-systemfiles.yml) Check if users file '.bash_profile.ORIG' exists
ansible.builtin.stat:
path: "~{{ item.name }}/.bash_profile.ORIG"
path: "~{{ user.name }}/.bash_profile.ORIG"
register: common_bash_profile_user_orig_exists
loop: "{{ default_user }}"
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
when:
- ansible_facts['distribution'] == "CentOS"
tags:
@@ -232,11 +242,12 @@
- name: (users-systemfiles.yml) Backup existing users .bash_profile file
ansible.builtin.command:
cmd: cp -a ~{{ item.item.name }}/.bash_profile ~{{ item.item.name }}/.bash_profile.ORIG
creates: "~{{ item.item.name }}/.bash_profile.ORIG"
loop: "{{ common_bash_profile_user_orig_exists.results }}"
cmd: cp -a ~{{ user_pair.0.name }}/.bash_profile ~{{ user_pair.0.name }}/.bash_profile.ORIG
creates: "~{{ user_pair.0.name }}/.bash_profile.ORIG"
loop: "{{ default_user | zip(common_bash_profile_user_orig_exists.results) | list }}"
loop_control:
label: "{{ item.item.name }}"
loop_var: user_pair
label: "{{ user_pair.0.name }}"
when:
- ansible_facts['distribution'] == "CentOS"
tags:
@@ -245,13 +256,14 @@
# 1. Prüfen, ob für jeden User ein lokales _bash_profile existiert
- name: (users-systemfiles.yml) stat user _bash_profile
ansible.builtin.stat:
path: "{{ inventory_dir }}/files/homedirs/{{ item.name }}/_bash_profile"
path: "{{ inventory_dir }}/files/homedirs/{{ user.name }}/_bash_profile"
delegate_to: localhost
become: false
loop: "{{ default_user }}"
register: common_bash_profile_stats
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
when:
- ansible_facts['distribution'] == "CentOS"
@@ -265,13 +277,14 @@
mode: "0644"
loop: "{{ default_user | zip(common_bash_profile_stats.results) | list }}"
loop_control:
loop_var: user_stat
label: "{{ user.name }}"
when:
- ansible_facts['distribution'] == "CentOS"
- stat_result.stat.exists
vars:
user: "{{ item.0 }}"
stat_result: "{{ item.1 }}"
user: "{{ user_stat.0 }}"
stat_result: "{{ user_stat.1 }}"
tags:
- bash
@@ -329,13 +342,14 @@
# 1. Prüfen, ob für jeden User ein lokales _vimrc existiert
- name: (users-systemfiles.yml) stat user _vimrc
ansible.builtin.stat:
path: "{{ inventory_dir }}/files/homedirs/{{ item.name }}/_vimrc"
path: "{{ inventory_dir }}/files/homedirs/{{ user.name }}/_vimrc"
delegate_to: localhost
become: false
loop: "{{ default_user }}"
register: common_vimrc_stats
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
# 2. Falls vorhanden, Datei kopieren
- name: (users-systemfiles.yml) copy .vimrc if it exists
@@ -347,25 +361,27 @@
mode: "0644"
loop: "{{ default_user | zip(common_vimrc_stats.results) | list }}"
loop_control:
loop_var: user_stat
label: "{{ user.name }}"
when:
- stat_result.stat.exists
vars:
user: "{{ item.0 }}"
stat_result: "{{ item.1 }}"
user: "{{ user_stat.0 }}"
stat_result: "{{ user_stat.1 }}"
tags:
- bash
# 1) Lokal prüfen, ob ~/.vim existiert
- name: (users-systemfiles.yml) stat local .vim for each user
ansible.builtin.stat:
path: "{{ inventory_dir }}/files/homedirs/{{ item.name }}/.vim"
path: "{{ inventory_dir }}/files/homedirs/{{ user.name }}/.vim"
delegate_to: localhost
become: false
loop: "{{ default_user }}"
register: common_dotvim_stats
loop_control:
label: "{{ item.name }}"
loop_var: user
label: "{{ user.name }}"
# 2) Wenn vorhanden, .vim-Verzeichnis ins Home des Users kopieren
- name: (users-systemfiles.yml) copy .vim directory if it exists
@@ -375,14 +391,15 @@
dest: "~{{ user.name }}/"
mode: preserve # oder weglassen; 0644 wäre für Verzeichnisse falsch
become: true
loop: "{{ default_user | zip(dotvim_stats.results) | list }}"
loop: "{{ default_user | zip(common_dotvim_stats.results) | list }}"
loop_control:
loop_var: user_stat
label: "{{ user.name }}"
when:
- stat_result.stat.exists | bool
vars:
user: "{{ item.0 }}"
stat_result: "{{ item.1 }}"
user: "{{ user_stat.0 }}"
stat_result: "{{ user_stat.1 }}"
tags: [vim]
@@ -395,14 +412,15 @@
recurse: true
state: directory
become: true
loop: "{{ default_user | zip(dotvim_stats.results) | list }}"
loop: "{{ default_user | zip(common_dotvim_stats.results) | list }}"
loop_control:
loop_var: user_stat
label: "{{ user.name }}"
when:
- stat_result.stat.exists | bool
vars:
user: "{{ item.0 }}"
stat_result: "{{ item.1 }}"
user: "{{ user_stat.0 }}"
stat_result: "{{ user_stat.1 }}"
tags: [vim]
# --
@@ -448,7 +466,7 @@
mode: preserve # oder weglassen; nicht 0644 bei Verzeichnissen
become: true
when:
- root_dotvim_stat.stat.exists | bool
- common_root_dotvim_stat.stat.exists | bool
tags: [vim]
# 3) Ownership sicherstellen (rekursiv)
@@ -461,5 +479,5 @@
state: directory
become: true
when:
- root_dotvim_stat.stat.exists | bool
- common_root_dotvim_stat.stat.exists | bool
tags: [vim]