diff --git a/files/.vimrc b/files/.vimrc index 7da7271..1ab9bbd 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -47,7 +47,4 @@ syntax enable set background=dark " Load the cloned theme -"let g:gruvbox_contrast_dark = 'hard' -"colorscheme gruvbox -colorscheme challenger_deep -"colorscheme dogrun \ No newline at end of file +colorscheme challenger_deep \ No newline at end of file diff --git a/files/sccache/sccache.service b/files/sccache/sccache.service new file mode 100644 index 0000000..55cf47f --- /dev/null +++ b/files/sccache/sccache.service @@ -0,0 +1,24 @@ +[Unit] +Description=Shared Compilation Cache Daemon +After=network.target + +[Service] +Type=simple +# Укажите точный путь к бинарнику (узнать через `which sccache`) +ExecStart=/root/.cargo/bin/sccache +### TODO :: exec-stop ?? +#Restart=always +#User=hogweed1 + +# Жестко прописываем все переменные, чтобы не зависеть от терминала +Environment="SCCACHE_BUCKET=sccache-bucket" +Environment="SCCACHE_ENDPOINT=https://s3.guaranteedstruggle.host" +Environment="AWS_ACCESS_KEY_ID=L5SAHFW2Y7WD9220WE9Y" +Environment="AWS_SECRET_ACCESS_KEY=wRAlYYpSdYZ6YBWBMPrMMunmlntHnCU04lD3bpD5" +Environment="SCCACHE_S3_ENABLE_VIRTUAL_HOST_STYLE=false" +Environment="SCCACHE_REGION=us-east-1" +Environment="SCCACHE_START_SERVER=1" +Environment="SCCACHE_NO_DAEMON=1" + +[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 new file mode 100644 index 0000000..40c201f --- /dev/null +++ b/files/zsh/rm-orphaned-zshes.sh @@ -0,0 +1 @@ +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/playbooks/software/acme_sh.yml b/playbooks/software/acme_sh.yml index 1894c28..c91aee1 100644 --- a/playbooks/software/acme_sh.yml +++ b/playbooks/software/acme_sh.yml @@ -8,8 +8,11 @@ name: - git - curl + - socat state: present +#### TODO :: mkdir -p /etc/angie/ssl/$subdomain.guaranteedstruggle.host + - name: Create SSL directory for Angie ansible.builtin.file: path: "{{ angie_ssl_dir }}" diff --git a/playbooks/software/zsh/deploy-zsh.yml b/playbooks/software/zsh/deploy-zsh.yml index a3aac5b..05b3784 100644 --- a/playbooks/software/zsh/deploy-zsh.yml +++ b/playbooks/software/zsh/deploy-zsh.yml @@ -40,6 +40,16 @@ mode: '0644' tags: [always] + - name: "[{{ current_user }}] Генерируем итоговый .zshrc из шаблона" + copy: + src: ../../../files/zsh/rm-orphaned-zshes.sh + dest: "/etc/profile.d/rm-orphaned-zshes.sh" + owner: root + group: root + mode: '0644' + tags: [always] + + - name: Накат ZSH и плагинов для каждого пользователя include_tasks: user-tasks.yml loop: "{{ zsh_users }}" diff --git a/playbooks/ssh-certs/deploy-host-certs.yml b/playbooks/ssh-certs/deploy-host-certs.yml index 547301e..961eb69 100644 --- a/playbooks/ssh-certs/deploy-host-certs.yml +++ b/playbooks/ssh-certs/deploy-host-certs.yml @@ -117,4 +117,10 @@ - name: Restart SSH service: name: sshd - state: restarted \ No newline at end of file + state: restarted + +##### TODO :: добавить этих в конфиг для ликвидации висящих после ухода-компа-в-сон-сессий-ссшш: +### Проверять клиента каждые 30 секунд +#ClientAliveInterval 30 +## Если клиент не ответил 2 раза подряд — разорвать соединение +#ClientAliveCountMax 2 \ No newline at end of file