diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2015-11-23 11:39:09 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2015-11-23 11:39:09 -0500 |
| commit | ac9711606c9f3edb53fab9471c049f274fa22527 (patch) | |
| tree | 8b34f2db863f6243efd25c73812ebf8813f04093 | |
| parent | edc1d61981781d44a584da0838c3cf847d63b40a (diff) | |
| parent | edbb0abbb8b4ee9c36c09ba16ce7dff345e4939c (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/master'
| -rw-r--r-- | authorized_keys | 3 | ||||
| -rwxr-xr-x | bin/kj-sync-keys.sh | 10 | ||||
| m--------- | zgen | 0 |
3 files changed, 7 insertions, 6 deletions
diff --git a/authorized_keys b/authorized_keys index f72c037..b730e38 100644 --- a/authorized_keys +++ b/authorized_keys @@ -10,3 +10,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLg4w97XpMyb0rFY4CKSF/i1eGmdLcH4lusqpz6C66 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAE4Fn2R4pQ4ufwoZQ3c0DsBKpMoxmcqKihnF7n69rk+rM4JwSKfX/prLb1hdYzoGfryTKyvIGlriZb0+7gQc+MLqNm2KDHY7oUYN/E8Hx3Bmpj3zPfr+t+rvz9gYukfnoQUOQVRK4K6roY/u7PzAYsFBpO/GNC9YC7RzYNHTczZW/1mNbawXir23VboBb83pKWiucoEij+J04m3WnAUbEUzDIHvPmWgsijER/J67krIBTuiELlnAyHhPfdlQ8leupon69Zi1U7BBV85vb1D6ef7R+PUGCeA5fnG+38l+NpFwcLK48uOn0vCFPRPUipFUFUIpI2awV2ctZ7ZwZibUB orbekk@google ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpahdZ77BSZy1eE35V5TjxnOiSeL/YCjf0OawIj2nZTYieMRev0TMEjtX7QroAVUO48qPAjxRR1G1oHnOQHc3qujoQjiwm7wIn4lg5Z6j7OMzJBUjzKLIfXk49WDcBzSdxi0HGG1xsJ/rwHU9nhSv/0VmHYyqwwfP2R/0LDu0NtmPdBuQSrkPBiGUcOA5hAi/jmFibpVr14uRUbgMctTWS4ObChRq8xy65pt9twN4vJB/h+bWsMXqcZfLL/PyhPtwLiZrDe6GVn8Pre+OuOgQll6VJEcdZzjUdQtKq3XiD/rxAwQS3rHleIIc4PABgnjzF4k9hq6rJZdwMtBPjNOH1 orbekk@nexus5 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSUuOxOtrv60A/jRZhCdfgoB5A1qNy4awBFwNcLTmSrYAApuifj2OCLkWc/hthFKaVNPdfcWpJ/GogyMnyoI4CEeYcDJJTfQOqq1G8iUSr3/UNCrg3mpFobzGbxFmO+xUceWBjnz8+r4ggj/RFAexiV6ciZUOFlu9QDKcp3PHvaW0MAoS9bdZd9PuQ2K5QDvXVwAgOW8EOuQUxwsNXOIin0M702G1gsVCW0oRkVDPMsZBM4YgOnGvgZKyq5WK7JtSSvxRC0PlUF6uFR+SBkTl1v8ljXpKq3JGdK1NyRXezgCxjwA0xqdjalTEJUTQHSpnBTRrPPOAKwWff5qJGoT+D orbekk@pincer +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCve6ZJuqTqRXvqHnYkS6BAilc9Mmdcd8bXHLmI/5T0h59oHGbY35L+OmWLKLJwbkNkMLfsGz5ahCDmW04tf7yQdZ0LCfEpxoeLWHo24j866ZnlsJXnTzj0bjZZcbbr3NqtKPs8YeNAxX9lGB7MyH8j3njBKv+6rTcKJusnueIf/xTScTBLvFbaUPQjVYmQ8trdZtHqElfPAZW9H9MvSAOePCQFY6fP3S5+0enSPDb9Q4X4NhdLhBvOljH/Q9RhAvSReaeDBu1hEpOj3gwDpPpoC4amP4Geaq5S3bYlslV9HsOCdQHNmvLqLVruX+XhOhq7fUmqoir7jycuuM6UORhP orbekk@sabaki +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqifNkGvOBJcreOBBiwmjdS+ZEwA2P6/wQmhz8+r/7khsy9VtoWBYXCq2Z3fUDL2oqylubH49BlcGi/syE/S75jIg6ab+gGMaTu7Z+DzWestRhkNijFpFZF/NAgL1FvQpW1GdTWhjuWf+kLz8O7WqajwwdoHkktzIe54yrzM5e8B4xHTtcPs4+MsPDAwN3ROwU4Q8/HHUqlqugq7XQr95a5cg4HoGgtZHF9VxkmFLULL2AUvB+lH4SAVJf4dTCYney73eFEcO/PZKjhkAvwcRu3X3vxMMp6goF1rRw6H4EWrnoDwNk596NREtr2HEFxlidinNlSkJLBCodHO0Fz/Rl orbekk@dragon + diff --git a/bin/kj-sync-keys.sh b/bin/kj-sync-keys.sh index b8be72d..1a3c455 100755 --- a/bin/kj-sync-keys.sh +++ b/bin/kj-sync-keys.sh @@ -13,12 +13,10 @@ declare -r tmpdir=$(mktemp -d /tmp/kj_sync_authorized_keys.XXXXX) targets=( root@orbekk.osl.trygveandre.net tesuji.6.orbekk.com - login.6.orbekk.com - minecraft.6.orbekk.com + sabaki.6.orbekk.com + dragon.6.orbekk.com login.pvv.ntnu.no - aji.orbekk.com - moyo.orbekk.com - pi@photobox.6.orbekk.com + gote.orbekk.com ) authorized_keys_file=$HOME/dotfiles/authorized_keys if [[ ! -f "${authorized_keys_file}" ]]; then @@ -32,7 +30,7 @@ add_keys_to_file() { "/$begin_marker/"' { exit 0 } { print }' \ ${filename} > ${filename}.header awk \ - "/$end_marker/"' { should_output=1 } should_output { print }' \ + "/$end_marker/"' { should_output=1 } !'"/$end_marker/"' { if (should_output) { print } }' \ ${filename} > ${filename}.footer cat "${filename}.header" > ${filename} diff --git a/zgen b/zgen -Subproject 6ac1bf1b201f52d9f5493988f8b3f26b7c0299e +Subproject 3a0f26ed2f2d0b7b2f34fa5bac3c3a58d58cfc5 |