From f442d6fdc792c9b0923ea206fe6e4a0a77246d8e Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Thu, 26 Jan 2023 05:43:56 +0000 Subject: [PATCH] Update 4 files - /home/dot_ssh/run_onchanges_after_link-vagrant-authorized-keys.tmpl - /home/dot_ssh/private_config.tmpl - /home/dot_ssh/id_rsa.tmpl - /home/.chezmoitemplates/secrets/ssh-id-rsa --- home/.chezmoitemplates/secrets/ssh-id-rsa | 61 +++++++++++++++++++ home/dot_ssh/id_rsa.tmpl | 3 + home/dot_ssh/private_config.tmpl | 4 -- ...es_after_link-vagrant-authorized-keys.tmpl | 10 --- 4 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 home/.chezmoitemplates/secrets/ssh-id-rsa create mode 100644 home/dot_ssh/id_rsa.tmpl delete mode 100644 home/dot_ssh/run_onchanges_after_link-vagrant-authorized-keys.tmpl diff --git a/home/.chezmoitemplates/secrets/ssh-id-rsa b/home/.chezmoitemplates/secrets/ssh-id-rsa new file mode 100644 index 00000000..82235b12 --- /dev/null +++ b/home/.chezmoitemplates/secrets/ssh-id-rsa @@ -0,0 +1,61 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzQ1g0d01NRjUvRG9hSjNk +RG9SUnJuY2VYeTdyL1Zmcm9HaGhTRkl4TVNnCiticzNXaGZPTkhqNkhEcS9lNFRu +ZHV6Ukdta2RVRUl6SXlmTHl0bUVnQ3cKLS0tIERoTFlxRWVweXhOQ29OTVUrSnJn +cGk1dnJCdkxtdGtDYTduS2llRnRxZ1UK/gF/6oKewFiNVep6hLOK0a219FnlkRPu +fzcMTYrjHkMTVXe9q0DwLEk8TO9UiVOfDX0jUxBCsnHZTWMjff5gNDwwtBAbCEly +5ZtC+UhA8CrO2PD+XELcauj4F7fM6jMh3MZ7FDB3NANTWh8UfnD46p56oisuTkme +tW910cdoEnXfYbfguk6ROT6cmYlRhZsUbPULC1aIQdvbG5363smrwPiTNAIW9dM2 +sxB+N7fPGm917DF95eKY9k14EMmrOk0IZezOiwzzGH6NpGyXjtENeCczxdaQDX0V +UGHjR1okfbNGckvGG8Y5lnhIfo9vNjOKg6YUgi8eEBZVeW+EXc+XcqZvQnzUTHjh +ob3oLWrU5eUe9CRbz7ns3rcKyW/y+7k5mBEWYILMYIZwFV8CCxfCq9zBtYH69TA6 +7yn1FJgJLEhhiYPv3F+QyvXdonvf+V2OiJe0qxy3EFLH9gyn58DD7VpJyvplE5jJ +vtMqXIyUaKZr9Df/7ovldaHTURe/q8tIvBQeS11JffjB3s99fw8pDbPWZ3FmeRjX +sXPSsNut9KD7ooX4+KR2BUCW8DFl/d7B324rY0PvdBAHd8howqKD2MyVC09tPrhC +h7R+7BA5EALK2moK4daEvNdjPGzjcDokkNigTT9dKarKJjaB1xEcQBradvte0zEn +SsYCa2h63nyS/ZsNxvPdzMi2X3+DU4ON2mp74OpEIu+IfYQENQ2VHGmbBhhCDtq4 +xilltMRQOwcm+490FRbSGrd83goeQeRd22vkD6CoG59WFCv7MGxFw0CWuQf+Y4sH +rMhYoTF4NCBiAXHu1ubOx+VyBYby881jTBSVmd5MNoro4L59FnRbtr3VPM6qv+27 +FOKP/AxiSDCGwgGog58rhbdBIuT4t8JWU19KkIQ+9AWIq1Jx9M05L3h0bDuM61F/ +RUFlsm0ZhNEpE8O4rUMZc50Ozs5GXM+Dxl9zvyFrI6/QnMuVqi5MRr2wgbVZ5HTk +6t3zWH/M0yqpZwpjAi9rDfa2p/ajp3cQmSuTCAzTmhnyg2ggdxtIJWn4G1BmTJ25 +BMWrfV5a1/CkcJdKySUec1QQ6uDH5VUHh1P9GtUR/Q5pX4VP4iR8CuAHO/ZwRA+3 +dWJM2A4iGk47GH+WUmn47SmNG6T81agae8UHirh9V+Fxme59fxTIbSozNdEAvfTv +aR4dkYl8knpOQrC2mh2ayerR4AD2MV4i+68zFXd1cuY/8d5+C17WDs6e5AEvq8qk +ZhNG2MkUtLRuFph+7IRg0iCbIPZMlG/SWmsS6uulok3vB7u8jYHLS8NUQrRzBPbG +xVxKCndfc5uu0FRx2dhfDskwx8ziJttnvv1s5BrHQ+ztxhEHeODBfHcBE1/pFO6E +aH/J5drRd1+Y0z16Kf3mzwYY16DlgVfeKV00elHs/saZsCJ5jWK43ugn7BizJ5h9 ++VKNeijCM0eGYPGsc0qE7RX1SDFjdOcg/AaKP3qCP3iRcNdC80qy0gzrAF0VjTmA +LsLgh/JEU+ls/nNDkEHPIiCNWcPpRGjMoYWY4edqYrSxfiQbhzhH/RhhJjq1O7bW +KWlWU9mqhtVDa7GW6nTt+fxqw151jTppsEacyVtzdwP4qVgaO5LYAAsjWgz0bad8 +CBK6XWkU1tfTyd+/UXeEKOQauuiogG1JBkPay6zCNONl2DmMyCOjYQ4IGyMEt9SB +xSi0uBzwVYV+oUHEcr+dhrsDmx5Mr6DtpKhcc+8rohi4U/nH5Yai3KIDEOrpYKap +FCJ+kAAPau6bLrPAobMAppqUEV9aeBqr3xbwNfhQk3hbF1Dgrl1CSqCt+s2hBaDz +cUY7c2co/aJK6WJFAE9GRmrOAT3t3bjqelDNpz6QFNq6eDRUgD9/n90Knw9wGTgh +K+zdOTNwRyNovTqtMpR9GHOdxbuTv/lvVF+RZayX5wm52NyadfDMvNPBnG5TgS23 +MzwDPrAhLfL6aeDqK8ycz+pX09ORKtpuIwB70dL4FrifJWGeU+HuHOcw/EtI5dqj +3KkdgW/hEHaycnXFfUXk/sJWO5BFspGELiFVAU+XdhJ9Sd/GO5Z9hUJEBTuu4PRd +N9LV8MVhPgXVoxrXAk4cun4kJrI0VpfgQoVjZVuYPWPtrlDzl3/F341d1AShx+eF +NpgSi1pd1PqZ3fUlgmcmLqqF+wvLiLoj5CP6gpz7ldLul3jDTmmAtHxCgitJPvfN +XJiuGHLqO/CKG0EwiAtgBbkYBz5fpytp5xyTWiCWnqERI9RzsPz6IvV2PhB0sqf0 +Jpv9RPjzK+OzPZupjopGuDOE/5GwCnur16rNiKjDK9Pik74s4FiTO3X/mAPu+vd+ +8rGOOzd77YLVYjbxlApUk/a5wIlfslYJmNmscK02icwZKVw170VVrLPPm5JSs28e +ZtPs9Bn5os+/+FR2M60Dyd6t/TVk+8N3y6hpKW+F+y5gCz+BNMx7SLE7VxHzJbZu +N3HlrV6s2kKIxIZZPT8mBuAmm5aE/+mQjG6W3hdqXCwt1nWwDAAkyTUv6SpD5Ojk +377ZjKIiJ7XmhCzvGWYJNhuffWX2WmJbevxXuLNSGn6fkilLgs4sQ+2LEadx4Lxq +ryrbp0GnLa4YJAe41d1ZlJUdAMtOuzrs5tECDVm2O4o8Z9/Zl5TS72CRogmp6gXp +5cdb92FvpmVl6oWrl3r0RRPRwe+ALaS14q61zyxZu8zUiZ6sgJbKnWF40cCJlmwG ++fOdvsEZaDevgqWff9aNll+zJG2AMqR7/ZyL7t7aqRyP7WY4aoJTaJpiLeszVbGN +SYvIDFG1i7S/j8gLOgOiX4O6ZBAKQEteY4z5hlzNflk2qi0haHG+eBmxzKkwrpiy +Nx9uTcdHJudxkXU5MgEto8/OwrDyqUUz9YIcUWb2M+O/wnuSnxNIsGTX3wk8uFs1 +Na8GSZvhzAc5CbDz/5Rhuqk6unaN0JyuLVKuN5SXUmIkFcj7ldUEzt/pOsyY8kSu +XgAWMJl9tU89k/KLemzkfEUKO+DbyrUjiusQqC9fi+EBY0GayXaxioe3JnJ626Wa +pZl6umi4/jslU68paNDefvYq5wsGaAP55ueHZq1sY22QV02NGNTgBUB6dG4kC9bX +0YDklGiXvi7TavOnVZ6y19iKJi7oyYLlQJp/JGQlHq26DgKG5keNnsoPYc51Ui2v +72gJHYU4cE6kM6Nv2u4k1eAHuSrS1L+oXa3PJwjpxUtbW81H4GHuShDSzNIyFadN +xKDg5SFlDR6jSuCnd5ormFoE9xFNXsRZdt0SZZB0avilceMfrnmclWbuhg0GznYr +k6X9EHsfYtQjaqA+qZiubw04PgEwIafW+xG0/2hFn6kpdM/wfH+b6ZslBI9+FtZH +Ckxx2pvLfdM9Z3dUq3/RbtZsThqxMxJC5fCjIgdBrzSxSggywoPYiDu2bK3KxxJs +9xCxaQvQHhGZlYxBvE2nOfgzXSI77PS6iTHDurORP9vIIDmuzIKc3n2F+0QCzU9C +SgiIuurg +-----END AGE ENCRYPTED FILE----- \ No newline at end of file diff --git a/home/dot_ssh/id_rsa.tmpl b/home/dot_ssh/id_rsa.tmpl new file mode 100644 index 00000000..e343e817 --- /dev/null +++ b/home/dot_ssh/id_rsa.tmpl @@ -0,0 +1,3 @@ +{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ssh-id-rsa")) -}} +{{ includeTemplate "secrets/ssh-id-rsa" | decrypt -}} +{{ end -}} diff --git a/home/dot_ssh/private_config.tmpl b/home/dot_ssh/private_config.tmpl index 6e1ce506..6cc9efe7 100644 --- a/home/dot_ssh/private_config.tmpl +++ b/home/dot_ssh/private_config.tmpl @@ -1,7 +1,3 @@ -# Host *+* -# UserKnownHostsFile /dev/null -# StrictHostKeyChecking=no -# ProxyCommand ssh -v $(echo %h | sed -e 's/+[^+]*$//; s/\([^+=]*\)=\([^+]*\)$/\2 -l \1/; s/^\([^+:]*\):\([0-9]*\)+/-p \2 \1+/' ) -W $(echo %h | sed -e 's/^.*+//; s/:.*$//;'):$(echo %h | sed -e ' s/^.*+//; /:/!s/^.*/22/; s/^.*://' ;) Host * AddKeysToAgent no Compression no diff --git a/home/dot_ssh/run_onchanges_after_link-vagrant-authorized-keys.tmpl b/home/dot_ssh/run_onchanges_after_link-vagrant-authorized-keys.tmpl deleted file mode 100644 index e33d39d8..00000000 --- a/home/dot_ssh/run_onchanges_after_link-vagrant-authorized-keys.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -{{ includeTemplate "universal/profile" }} -{{ includeTemplate "universal/logg" }} - -### Link authorized_keys to authorized_keys.vagrant if username is vagrant -if [ "$USER" == 'vagrant' ]; then - logg info 'Linking authorized_keys.vagrant to authorized_keys in the .ssh folder' - ln -s "$HOME/.ssh/authorized_keys.vagrant" "$HOME/.ssh/authorized_keys" -fi