From a06bc8d53ed9e54e5ef52de798f8635000316eb2 Mon Sep 17 00:00:00 2001 From: hogweed1 Date: Tue, 10 Nov 2026 21:05:11 +1000 Subject: [PATCH] well, --- files/zsh/rm-orphaned-zshes.service | 10 ++++++ files/zsh/rm-orphaned-zshes.sh | 10 +++--- files/zsh/rm-orphaned-zshes.timer | 13 ++++++++ playbooks/software/zsh/deploy-zsh.yml | 45 ++++++++++++++++++++++++--- 4 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 files/zsh/rm-orphaned-zshes.service create mode 100644 files/zsh/rm-orphaned-zshes.timer diff --git a/files/zsh/rm-orphaned-zshes.service b/files/zsh/rm-orphaned-zshes.service new file mode 100644 index 0000000..3e7e7b9 --- /dev/null +++ b/files/zsh/rm-orphaned-zshes.service @@ -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 \ No newline at end of file diff --git a/files/zsh/rm-orphaned-zshes.sh b/files/zsh/rm-orphaned-zshes.sh index 41093c0..3073989 100644 --- a/files/zsh/rm-orphaned-zshes.sh +++ b/files/zsh/rm-orphaned-zshes.sh @@ -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' \ No newline at end of file diff --git a/files/zsh/rm-orphaned-zshes.timer b/files/zsh/rm-orphaned-zshes.timer new file mode 100644 index 0000000..8dd8428 --- /dev/null +++ b/files/zsh/rm-orphaned-zshes.timer @@ -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 \ No newline at end of file diff --git a/playbooks/software/zsh/deploy-zsh.yml b/playbooks/software/zsh/deploy-zsh.yml index 8ffa5d6..7246825 100644 --- a/playbooks/software/zsh/deploy-zsh.yml +++ b/playbooks/software/zsh/deploy-zsh.yml @@ -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