diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-21 22:24:52 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-21 22:24:52 -0400 |
| commit | f185335b03ddaafa6de5492b28b3d8e2f976a705 (patch) | |
| tree | 8abc1047d878ab934e56f5f18eaf2d098ecf4c8d | |
| parent | 8d9be2536db7ce5994bab5448f8466d2da305d3c (diff) | |
| parent | 8e6bcd805de72beab6f4833b254027b601d6db15 (diff) | |
Merge branch 'master' of sabaki.orbekk.com:/storage/projects/dotfiles
| -rw-r--r-- | authorized_keys | 1 | ||||
| -rwxr-xr-x | bin/kj-sync-keys.sh | 9 | ||||
| -rw-r--r-- | mbsyncrc | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/authorized_keys b/authorized_keys index 017726d..6bee61e 100644 --- a/authorized_keys +++ b/authorized_keys @@ -8,3 +8,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCve6ZJuqTqRXvqHnYkS6BAilc9Mmdcd8bXHLmI/5T0 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqifNkGvOBJcreOBBiwmjdS+ZEwA2P6/wQmhz8+r/7khsy9VtoWBYXCq2Z3fUDL2oqylubH49BlcGi/syE/S75jIg6ab+gGMaTu7Z+DzWestRhkNijFpFZF/NAgL1FvQpW1GdTWhjuWf+kLz8O7WqajwwdoHkktzIe54yrzM5e8B4xHTtcPs4+MsPDAwN3ROwU4Q8/HHUqlqugq7XQr95a5cg4HoGgtZHF9VxkmFLULL2AUvB+lH4SAVJf4dTCYney73eFEcO/PZKjhkAvwcRu3X3vxMMp6goF1rRw6H4EWrnoDwNk596NREtr2HEFxlidinNlSkJLBCodHO0Fz/Rl orbekk@dragon ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC++iDFF7M0kdOzkLpoxodQ/UOq6ez4lQ81jxbxMhRV8OEgqWoM6ONGmrdDXROvcQ0FwiNxTja/UTuxp/wutUOXDlIqi+SxnsyyHYBDBw1dO2IeNI1fVpkA1f5ctVWrgi7ek6MwHYFoAebBlzZpjPezX++i3kspSvtOrV/fDXP4YuIYl1c7rt/qWscNHks5bqbthSmqQZtyEXuy3uA/w4Ji7UZGyxfx2JCAT1tLwKWIuwtggM/aK800Sb2dGgorQpx/iFQXj48Cg3qaUhXaaajilEo4LpRZDuKZa7xlNZtTzuLjF4Rk6HP5T7BiXhhuCsI0Whern+F/kW3RseElHkGt orbekk@aji # Thinkpad X220T ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDaAR7FqzSGlbSjwlMuB3GToxl4G1MWPJThYbjm0rq1mbWsP4QNQclqjdJs4/T50L5pNO8O3r9DViJOy/yLnK3AIrx8FdVE14+gFzT5/Ct/Dp6sU1bZmNQ/GVVW0TXsCDyFRA0CMNwbXuFtnrtq9KWc8++Eu7KSfG8xNMNElBnN0kiGViV447dSooE6Pr+Ae+Iprj5E6YRdgzjtdC+/y0T4SmS7OTuoWp399zvVr7UiN4BUGnQGENRoIMREZ9lRnQ9wzHcHDWWUN5YQqlZn1e3aIAYG8KLboz0/GL2HmryhZ+9GGU2lulnG04xNbG1e8xJ6dRF2S7cjIj2iTzNunaAd orbekk@orbekk.fra.corp.google.com +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZ7wDMkLbSqJ4lvUTPbrhHe8B/vQ1wCTvPcVfybLB4aKOEEYIvBRpEbsY9KD3nS0dSqnuZs/r73j4u4tWP67HguHgScqjz05y/MTRHOLv4mtPU6za7FiaUOf+FofFefAdAlP1IM5M9HgqMnDWdQAug3OvNfUUniOctRDgn15ADS/Gy94BBPEREi6NwdeHokm0GJeqXGFzCxFezYOyxruWZyQEYbpyA5rz4nzpOgU1nHSpSR+dS+opLmMrrgQ0tMxQKLVJgoUnQK/OR/nmsTbMmvnTWtIUe0IpEhYVUpVPlR8J9fuRQRui5INaGXuZpHV2aoNF6GrWUDHBJkKRnm4P/ orbekk@pincer diff --git a/bin/kj-sync-keys.sh b/bin/kj-sync-keys.sh index 64c3ca9..2037990 100755 --- a/bin/kj-sync-keys.sh +++ b/bin/kj-sync-keys.sh @@ -12,8 +12,9 @@ declare -r tmpdir=$(mktemp -d /tmp/kj_sync_authorized_keys.XXXXX) targets=( root@orbekk.osl.trygveandre.net - sabaki.kk.orbekk.com - dragon.kk.orbekk.com + sabaki + semeai + dragon login.pvv.ntnu.no gote.orbekk.com ) @@ -45,9 +46,9 @@ for target in ${targets[@]}; do tmp="${tmpdir}/${target}" touch ${tmp} if [[ $overwrite != true ]]; then - ssh ${target} 'cat .ssh/authorized_keys || echo -n' > ${tmp} + ssh ${target} 'bash -c "cat .ssh/authorized_keys || echo -n"' > ${tmp} fi add_keys_to_file "${tmp}" ssh ${target} 'mkdir -p .ssh' - cat "${tmp}" | ssh ${target} 'cat > .ssh/authorized_keys.tmp && mv .ssh/authorized_keys{.tmp,}' + cat "${tmp}" | ssh ${target} ' bash -c "cat > .ssh/authorized_keys.tmp && mv .ssh/authorized_keys{.tmp,}"' done @@ -2,7 +2,7 @@ IMAPAccount gmail PipelineDepth 200 Host imap.gmail.com User kjetil.orbekk@gmail.com -PassCmd "pass show sites/gmail-app-password" +PassCmd "cat /home/orbekk/.gmail-password" SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt |