This commit is contained in:
10
files/zsh/rm-orphaned-zshes.service
Normal file
10
files/zsh/rm-orphaned-zshes.service
Normal file
@@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=Clean up orphaned zsh and gitstatusd processes
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/root/adm/rm-orphaned-zshes.sh
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,6 +1,6 @@
|
||||
(
|
||||
# Даем сессии 2 секунды полностью подняться в фоне
|
||||
sleep 1
|
||||
sleep 2
|
||||
CURRENT_PID=$$
|
||||
|
||||
pgrep -f zsh | while read -r pid; do
|
||||
@@ -12,19 +12,19 @@
|
||||
# Если родитель PID 1 — уничтожаем
|
||||
if [ "$(ps -o ppid= -p "$pid" 2>/dev/null | tr -d ' ')" -eq 1 ]; then
|
||||
kill -9 "$pid" 2>/dev/null
|
||||
fi
|
||||
fi || true
|
||||
done
|
||||
pgrep -f gitstatusd | while read -r pid; do
|
||||
# Пропускаем себя, чтобы не убить текущую сессию
|
||||
if [ "$pid" -eq "$CURRENT_PID" ]; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
# Если родитель PID 1 — уничтожаем
|
||||
if [ "$(ps -o ppid= -p "$pid" 2>/dev/null | tr -d ' ')" -eq 1 ]; then
|
||||
kill -9 "$pid" 2>/dev/null
|
||||
fi
|
||||
fi || true
|
||||
done
|
||||
) &
|
||||
)
|
||||
|
||||
#pgrep -f zsh | xargs -I {} sh -c 'if [ "$(ps -o ppid= -p {})" -eq 1 ]; then kill {}; fi'
|
||||
13
files/zsh/rm-orphaned-zshes.timer
Normal file
13
files/zsh/rm-orphaned-zshes.timer
Normal file
@@ -0,0 +1,13 @@
|
||||
[Unit]
|
||||
Description=Run rm-orphaned-zshes.service every hour
|
||||
|
||||
[Timer]
|
||||
# Запускать через 5 минут после загрузки системы
|
||||
OnBootSec=5min
|
||||
# И затем повторять каждый час
|
||||
OnUnitActiveSec=1h
|
||||
# Размытие по времени (опционально, чтобы не грузить хост, если контейнеров много)
|
||||
AccuracySec=1m
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
@@ -38,17 +38,54 @@
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0644'
|
||||
tags: [always]
|
||||
tags: [always]
|
||||
|
||||
- name: "Проставляем /etc/profile.d/rm-orphaned-zshes.sh"
|
||||
- name: Creates directory /root/adm
|
||||
ansible.builtin.file:
|
||||
path: "/root/adm"
|
||||
state: directory
|
||||
group: "root"
|
||||
owner: "root"
|
||||
|
||||
# script
|
||||
- name: "Проставляем /root/adm/rm-orphaned-zshes.sh"
|
||||
copy:
|
||||
src: ../../../files/zsh/rm-orphaned-zshes.sh
|
||||
dest: "/etc/profile.d/rm-orphaned-zshes.sh"
|
||||
dest: "/root/adm/rm-orphaned-zshes.sh"
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0744'
|
||||
tags: [always]
|
||||
|
||||
# service
|
||||
- name: "Проставляем /etc/systemd/system/rm-orphaned-zshes.service"
|
||||
copy:
|
||||
src: ../../../files/zsh/rm-orphaned-zshes.service
|
||||
dest: "/etc/systemd/system/rm-orphaned-zshes.service"
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0644'
|
||||
tags: [always]
|
||||
|
||||
|
||||
# service
|
||||
- name: "Проставляем /etc/systemd/system/rm-orphaned-zshes.timer"
|
||||
copy:
|
||||
src: ../../../files/zsh/rm-orphaned-zshes.timer
|
||||
dest: "/etc/systemd/system/rm-orphaned-zshes.timer"
|
||||
owner: root
|
||||
group: root
|
||||
mode: '0644'
|
||||
tags: [always]
|
||||
|
||||
|
||||
- name: Перечитать конфигурацию systemd и запустить таймер
|
||||
ansible.builtin.systemd:
|
||||
name: "rm-orphaned-zshes.timer"
|
||||
state: started
|
||||
enabled: true
|
||||
daemon_reload: true
|
||||
tags: [always]
|
||||
|
||||
|
||||
- name: Накат ZSH и плагинов для каждого пользователя
|
||||
include_tasks: user-tasks.yml
|
||||
|
||||
Reference in New Issue
Block a user