From a7d23f06c4243b927fe8c6abebf8e127ee119204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Tue, 5 Jul 2022 22:27:10 +0200 Subject: [PATCH] Start ssh agent for some users --- _machines/ares.yml | 1 + _machines/mars.yml | 2 ++ _machines/neptune.yml | 2 ++ zsh/zshrc.j2 | 9 +++++++++ 4 files changed, 14 insertions(+) diff --git a/_machines/ares.yml b/_machines/ares.yml index d212110..1b39f72 100644 --- a/_machines/ares.yml +++ b/_machines/ares.yml @@ -26,6 +26,7 @@ users: bigger_font: true mail: hannes@hkoerber.de git_gpg_sign: false + ssh_agent: false gpg_agent: true gpg_agent_for_ssh: true gpg_key: diff --git a/_machines/mars.yml b/_machines/mars.yml index 7b01d25..b9a6c25 100644 --- a/_machines/mars.yml +++ b/_machines/mars.yml @@ -18,6 +18,7 @@ users: manage_css: false mail: hannes.koerber@tradebyte.com git_gpg_sign: false + ssh_agent: true gpg_agent: false gpg_agent_for_ssh: false environment: @@ -42,6 +43,7 @@ users: manage_css: true mail: hannes@hkoerber.de git_gpg_sign: false + ssh_agent: false gpg_agent: true gpg_agent_for_ssh: true gpg_key: diff --git a/_machines/neptune.yml b/_machines/neptune.yml index ae9829a..e643fd4 100644 --- a/_machines/neptune.yml +++ b/_machines/neptune.yml @@ -18,6 +18,7 @@ users: manage_css: false mail: hannes.koerber@tradebyte.com git_gpg_sign: false + ssh_agent: true gpg_agent: false gpg_agent_for_ssh: false environment: @@ -46,6 +47,7 @@ users: manage_css: true mail: hannes@hkoerber.de git_gpg_sign: false + ssh_agent: false gpg_agent: true gpg_agent_for_ssh: true gpg_key: diff --git a/zsh/zshrc.j2 b/zsh/zshrc.j2 index e09876e..9500ab4 100644 --- a/zsh/zshrc.j2 +++ b/zsh/zshrc.j2 @@ -19,6 +19,15 @@ elif [[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlightin source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh fi +{% if user.ssh_agent %} +if ! pgrep -u "$USER" ssh-agent > /dev/null ; then + ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env" +fi +if [[ ! "$SSH_AUTH_SOCK" ]]; then + source "$XDG_RUNTIME_DIR/ssh-agent.env" >/dev/null +fi +{% endif %} + {% if distro == 'ubuntu' %} alias imv=imv-x11 {% endif %}