From e907b712ebd82c326245fb22ee7e3555f9710bbb Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Sun, 13 Nov 2022 00:09:26 -0500 Subject: [PATCH] [ssh] Mostly ssh changes --- .gitignore | 7 ++-- fish/.config/fish/config.fish | 2 ++ gtk/.config/gtk-3.0/bookmarks | 2 ++ gtk/.config/gtk-3.0/servers | 52 +++++++++++++++++++++-------- ssh/.ssh/2022_h2_powellc.pub | 1 + ssh/.ssh/authorized_keys | 1 + ssh/.ssh/config | 7 ++-- ssh/.ssh/ff_cloud100_rsa_2021q3.pub | 1 - ssh/.ssh/ff_cloud101_rsa_2021q3.pub | 1 - ssh/.ssh/ff_cloud102_rsa_2021q3.pub | 1 - ssh/.ssh/ff_cloud103_rsa_2021q3.pub | 1 - ssh/.ssh/ff_cloud10_rsa.pub | 1 - ssh/.ssh/jails-git.pub | 1 + vim/.vimrc | 3 -- 14 files changed, 52 insertions(+), 29 deletions(-) create mode 100644 ssh/.ssh/2022_h2_powellc.pub delete mode 100644 ssh/.ssh/ff_cloud100_rsa_2021q3.pub delete mode 100644 ssh/.ssh/ff_cloud101_rsa_2021q3.pub delete mode 100644 ssh/.ssh/ff_cloud102_rsa_2021q3.pub delete mode 100644 ssh/.ssh/ff_cloud103_rsa_2021q3.pub delete mode 100644 ssh/.ssh/ff_cloud10_rsa.pub create mode 100644 ssh/.ssh/jails-git.pub diff --git a/.gitignore b/.gitignore index c864ec9..1085831 100644 --- a/.gitignore +++ b/.gitignore @@ -17,12 +17,9 @@ QtProject.conf powellc 1904_powellc 2022_git -ff_cloud10_rsa -ff_cloud100_rsa_2021q3 -ff_cloud101_rsa_2021q3 -ff_cloud102_rsa_2021q3 -ff_cloud103_rsa_2021q3 +2022_h2_powellc jails +jails-git known_hosts error.log *.envrc diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index f886b30..3ffbf87 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,5 +1,7 @@ if status is-interactive source ~/.asdf/asdf.fish + set -gx GOPATH ~/.go + set -gx PATH ~/.go/bin $PATH set -gx PATH ~/.asdf/installs/rust/latest/bin $PATH set -gx PATH ~/.cargo/bin $PATH set -gx PATH ~/.bin $PATH diff --git a/gtk/.config/gtk-3.0/bookmarks b/gtk/.config/gtk-3.0/bookmarks index 2de6556..f0e6431 100644 --- a/gtk/.config/gtk-3.0/bookmarks +++ b/gtk/.config/gtk-3.0/bookmarks @@ -3,3 +3,5 @@ file:///home/powellc/var/inbox file:///home/powellc/var file:///home/powellc/src file:///home/powellc/tmp +sftp://root@pandora.unbl.ink/root Pandora +sftp://root@greip.unbl.ink/root Greip diff --git a/gtk/.config/gtk-3.0/servers b/gtk/.config/gtk-3.0/servers index 1fa31b3..08c3f38 100644 --- a/gtk/.config/gtk-3.0/servers +++ b/gtk/.config/gtk-3.0/servers @@ -3,30 +3,35 @@ xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info" > - + + / on greip.unbl.ink - + - + + / on pandora.unbl.ink - + - +<<<<<<< Updated upstream + +||||||| Stash base + / on sftp.cloud100.15five.com - + @@ -49,34 +54,55 @@ - + +======= + / on sftp.cloud100.15five.com - + - + + + + + + + + + + + + + + + + + + + / on greip.unbl.ink - + - + / on pandora.unbl.ink - + - \ No newline at end of file + +>>>>>>> Stashed changes diff --git a/ssh/.ssh/2022_h2_powellc.pub b/ssh/.ssh/2022_h2_powellc.pub new file mode 100644 index 0000000..f4993dc --- /dev/null +++ b/ssh/.ssh/2022_h2_powellc.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMr7Wwdda04owkvo9cemdTxuqAwyfRt2NORUPgm9+JAE colin@unbl.ink diff --git a/ssh/.ssh/authorized_keys b/ssh/.ssh/authorized_keys index af28ba7..72c97f3 100644 --- a/ssh/.ssh/authorized_keys +++ b/ssh/.ssh/authorized_keys @@ -3,3 +3,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAuYeEACWGt+wrKzZnPaDf4OAXWlWcMA8chC4yyh3czR ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7mO6H91Ax6AfxOeX0RpzIPN/xvxrhXZY5k+A5Y9dr3Xl4Y0fHsa83oul64XnmAxm0rm552QwpqFSqSiyKYzuv1ZEwq3MJWth4TFXI8owMqvSROz5ZrHWDQzRC0mVcWVRTsvhnb5Mz2aixarisCd7FgVbzBOuVaJBCqzZrHj/+06zRlMloljrX7I2vJIP2xL7aISjaThlbIzOqi34iP+HjnAATmeilyVXLQuh2XONQt4WoSaZcQjPnYT5li/9bezCZv2YM6o5KIFgclO6LRxDr6D5+Yw9/BoMedob+/VeGLkABAqFrOZQA6mSOxJvlti/OiBZA8b4zUSzYESK/sjcH root@box.onec.me ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/zDMnzrppS4b6GSD4z3ZnWiKOSRPMYe6vbduKeObuuEP9hXdm5IEn0lWvlk2HDlYwT+HADHnxIlu0ZsFyWEGaNvVPM1D4x5hSSdTnqm5LRoOt+y1EntU9oDFgvio++XxETaq3SNw/S9twX3X+CbFkjbAXN0bJqKy/ziLE8m2Qk2wiCRfEWxV1c9A0ba48FeGABxaVRrGAveNq9lqqJsWUGY6pQ01STSO/uHcLJmkEhXZQuRt4qAS/SjCDNhLkmpAWrtxuiOUt8GtgrzMl8stXJs49FsO/iIzgc8yneDQ7Z3NUJymx86/tb0UPoCeHljkFFzyXSEjMgM9owoUp73uf powellc@prometheus ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFbkMSZmqyHZ0uh8uAxRJZf+8sKYkNpXz8o8YMw6grjz Colin's private key for 2022-H2 +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMr7Wwdda04owkvo9cemdTxuqAwyfRt2NORUPgm9+JAE colin@unbl.ink diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 3017331..3ba1f3d 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -5,8 +5,9 @@ Host * ServerAliveInterval 300 ServerAliveCountMax 2 AddKeysToAgent yes - IdentityFile ~/.ssh/1904_powellc + IdentityFile ~/.ssh/2022_h2_powellc VerifyHostKeyDNS no + IdentitiesOnly=yes Host github.com ServerAliveInterval 300 @@ -59,7 +60,7 @@ Host greip.unbl.ink User root # Inside our network, skip strict host key checking -Host *.local +Host *.local *.service StrictHostKeyChecking no # Bare metal hosts @@ -120,7 +121,7 @@ Host penobscotbaypress.com User root ## Jail hosts all need a jump -Host *.local 192.168.1.* +Host *.local 192.168.1.* *.service User root IdentityFile ~/.ssh/jails Hostname %h diff --git a/ssh/.ssh/ff_cloud100_rsa_2021q3.pub b/ssh/.ssh/ff_cloud100_rsa_2021q3.pub deleted file mode 100644 index 2da5b45..0000000 --- a/ssh/.ssh/ff_cloud100_rsa_2021q3.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC12PsLavGTIr+yJCyOKc3Jkj3Ju9QP2XMZDYDe3r3lUxv6BHaUvI7YNnErwvJ7R7L4MWI2KPxpSzQCvOKaJERuJ7bBokYB427VaeJaV++iIimnW5vbaIKYyxN+MtaU0c2Wm8bMblQ560nxe+jmJQUB/qEvuM3tknqecrl2JLkGT3rZABbPIW50CkVOouji48gT2WzXvdjfW08Hd3FMipaesSQt8HqwpJ0aTO+c16/1kFW2E1JcVlmpJLi0N+G9ndDe2TjnENT4ELsceMzKsxwpdtOily+6ZRksLA4q6bKuaUJNF94i6IIgwN1+cMk64IDucHxz/E6JjbfufaPOgSNE02fkIKxq9Xg8BYFMLe8dKHyUCLV4N5m+f/Hpso8VyEOPGrePP+/MgOkTcGVy1Tn4OCIjD48fWUUaTMDim7qvVbcmFt/ibKf3DdY1jRPj50pMNZSBNkWpCOIMnM7K5ZjgfCoxDiNJPC3OLN8pVlCGuaGg9xg524YSfi2lxk2lw+wTDs7YuUz++XGf8cR6fivee7sfTrBphIQi9W4lyhhHSKMrAWh7B0lhNFAwQmSFo7CWBPAxfRYQZX1sIRUSEYB2CaNegj5a3un/ImujB6ecC1eGQAI620ViKaQszlUzzpuxz6rPLR+6t+FhQnrKiENgprZ85c7MEgjwxQhgE6RxcQ== colin's key for cloud100 diff --git a/ssh/.ssh/ff_cloud101_rsa_2021q3.pub b/ssh/.ssh/ff_cloud101_rsa_2021q3.pub deleted file mode 100644 index 78d1d78..0000000 --- a/ssh/.ssh/ff_cloud101_rsa_2021q3.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDXgpZDIMB/K53h+vxFtcxH5Q+K04PKn5x843pN/9icRq/hECGou3Y4uPMaXBucbhhKYnT++lAvzuFiLamOM8MKgua4dJK9GL93N8URPDNAndk4L7tPzYYSP9FMph2Z7uJatPBOixcZsXtwHazZUytEVe7YbR84LP0LKIKz8nYvQMPD5xBsebbj8hpQ0HyQsuzhLQhlv0Sdpoa8apAm0H1/tiOeBw9kHr0gfg7EEQ2T0T56/7s01T2zJct4gaQNz+Wtrei8LaJ2L77rtOCrfcv+bN2BdXehAxmwMC1u4qUayZnMaHajm3kJpqvYBpNNjBcMebCcEXfUiJhQHuFqf3gkouawq7HHbBea9m7DRDCxkA/H7/sV5idzlLjXlUdNGXYqJ2E9swYdlPqw6V/vdwFqp7ocgmgvPZYTTH7DER7EDSD9NxGggcbL6pQGnC4ejReGAEyuvJLMAICYvTldkbwShOaxHer51m0x1j5Lu9cqqfm9Dpmvpb9BQ8ZB6QmClthEn9tpzb1jFgaPQCSttig5lP4RV53dIaWF81hXlmbd6JEI/6+s1y5eNJdx9iZAlfh3xKhtNwONDtI+5HVJqqEnS7vA5erBIVemA73l26V9cNrNrKp5Re3MYBR2DhttIEf4OaZ61BRPtx/Jgb68f9ncv3rFD2kdJEX3jVlw2Ffm0Q== colin's public key for cloud101 diff --git a/ssh/.ssh/ff_cloud102_rsa_2021q3.pub b/ssh/.ssh/ff_cloud102_rsa_2021q3.pub deleted file mode 100644 index d62c720..0000000 --- a/ssh/.ssh/ff_cloud102_rsa_2021q3.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIFt6oHjOBkMo3Sl636u/Lix4aVi87GhWUJtgic4xmFiJAteOpiYe/4ceoJLTMFhqIVe+qKp3AL37fem+JzHMZd7NDPAOGElo9E3OcMWKDejaEDSmq2EezGf7wIpK8V3vWjs+WeONK/HEcvXnApiJy/h2ETgN4WCKhZ5+MWbIhpiPxy1VC+hQzudbecpV0vW1Scg6FGl0KKOo1KmqIc2zq5yUTO8vBPTcjVd9y3dhqnjBVa+4CzsPko5B2LQBxPrlGQo3SMnn7NuN5STbnGz0zlcBICYqYSuRpPxz8L9LPahz4rNS36//OKYRg0BNHt6/DU+7l9+CEB76Eh4lnHDrT5btqCllTZnJrd1Nc3OfrgIEXVPTNIzWV2byiNhXIJbWcFaqLGAwrZ0ytYFRvc1ld+Crm8ILkUDr/J7YLcjqcGRR12pZCtRGRiOElAyuzdQA0dInYebCxhlpJL3QfStbUaOBnf4afh0BMnRcuUmr9pfgrdlgglf1HOhqOuxTcOPXwsqdimPCNCmlvhshLvbNVAX9Z4+l58duLjJDTUHpTExz07lsQ4Jr+XLvv/FFZ/DRLg7W8Qzx30HKDpxjrfEOwRXAlUC9JAx8sOTYQHj614KCKXlqMqt7QuUhWpf13fRtnooHJ9Wyze8KFKCfJK6JkdBlAg0smRyaec2fOwPMeGQ== colin's public key for cloud102 diff --git a/ssh/.ssh/ff_cloud103_rsa_2021q3.pub b/ssh/.ssh/ff_cloud103_rsa_2021q3.pub deleted file mode 100644 index 353a57c..0000000 --- a/ssh/.ssh/ff_cloud103_rsa_2021q3.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQChuTTJ22gQjrdOZH0mkuVgE/UvGQs/ypT5jEBASZwOVfpKk9wFO61rMhZPEhl5FL1RnYtb0qXN1bC9pvgdRdRWNYPgXFarELtD/XBaS7bxDj0f9ME5l5I4n/nrXH+HKKu158qhEEvBfblv23SpZ7W35hhICmIDVr1A3c81ef+gTvhJxqzDnT784amvEKu+BjGpco2BQ5qk5lR3u2uRhU4PhaxklzAKjblPHI+uaQ19HBssHW+JxgaoIktRjjmZuoIHzVUkuzxZ5JBj89XY0XNTXS8NrFxtMitN4AWiVzcL87K5bk0GvoqpEpCABs4SbpDN3d6ztJGtB5OiacyzqsqwT5sYVeII9WB1hsXQ+N3WcFL0uwo5CKV56WH3xwvMNlV6PsOCgwCWI3C8MRSUcTws45CArS0xvVaM8lYDD5FsIAWAdQtsU3NcysPTooFvqRZJ98dBL9MKZ8/eckuqdoNxwx6K82vLf6dwjZ5SBXMvqIdu5q1MB8gUu+zWarvDbraWK1AEzQ4wftdrjE3W1ghHtGZj0Lh0nFFLKcxr0KHWuJ/QOZzyHkf1qO/KMAIhlnm6WnpCbBN/ZioblcfK+LKdWEffXHT/wsWH/b1lcLVf3W76lkxtNT3CwpzRTsKJa62PCO2xhcSOP6zS6jue/BmuEHBM47gMs2TxnSBdyV+SKQ== colin's public key for cloud103 diff --git a/ssh/.ssh/ff_cloud10_rsa.pub b/ssh/.ssh/ff_cloud10_rsa.pub deleted file mode 100644 index f0bd3d6..0000000 --- a/ssh/.ssh/ff_cloud10_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDjBjTEz6hJjipGHpKb0TbTeHgMq3TBpJ/zKgUlV2+9vMX85KvJm2Q72LzfaU6PVvYKicQU9TZqYZnPfs+bmtzmDw4VneVh00Pqu1d7KofYUOridV9mwQ5yxq5owg8lvyvNttJqUdRjtaJW0QrwphPfkVbXCZcrD0sf9dZYZiLa4XGuC1A4qBV8yWVumUiA0lmNyPFVWv9KKxL2L9o/lLuNEhd7VfN0bYaok9bAFsjfhqCm7YFVS+jVTVTPF87CmSbkAa9J8zm4eN+o7Q32+gZZo3jj7ApcgCWNOHT0oYIHaFGiyRk51WKAwTjI5wFpM3ODkGKulTFAzE1Xrz7GWOuiA/sz5tc/wlfOgb+KebucTQLF1hQayhSHPNbp/0oBUxtxQ+2po2hjqIPcD7CSXu9WJoqIPdJz5KQ3+Feh0foJ3GGNRjxXWzYZXhcl7rLJSb7ahptkkqa/COoQZIUOtmoXcMAegMPcElDtu+T3sgi+PHufdS+LJtt6RrFFNyxTkhO05GC86qGpMB++94nL5HqkptWl9PPKo19ukjxcRk/ncwY4CwPBtZibwlAmYF0tl2pLq5m9WXgs9he6V1h/4PcY6Y2jcUzXhEOt9Hwg3zvCQks3Sq5SohAVRbHa9sCOp5zjsHj2OBbuWp7gJOnlyVmeCY/g1DxicW6s0RG/FrvDw== powellc diff --git a/ssh/.ssh/jails-git.pub b/ssh/.ssh/jails-git.pub new file mode 100644 index 0000000..1388e22 --- /dev/null +++ b/ssh/.ssh/jails-git.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBnWgLcUcmTKWk7gHHXHANPmFud0f0tglnQELbZgLpZa colin@unbl.ink diff --git a/vim/.vimrc b/vim/.vimrc index ccbd06a..9048043 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -23,9 +23,6 @@ set encoding=utf-8 " set relativenumber set number -" better scheme -" colorscheme delek - " status bar set laststatus=2