diff --git a/configs/ssh/config b/configs/ssh/config index 79a237f..a15db02 100644 --- a/configs/ssh/config +++ b/configs/ssh/config @@ -1,26 +1,3 @@ -# Personal servers -Host rtl-netlink - HostName netlink.local - User pi - -Host rtl-compute - Hostname compute.local - User pi - -Host gw-ca-tor-01 - Hostname gw-ca-tor-01.servers.retrylife.ca - -Host hp-desktop - Hostname 10.9.0.12 - -Host ewpratten-laptop - Hostname 10.9.0.2 - User ewpratten - -Host ewpratten-desktop - Hostname 10.9.0.9 - User ewpratten - # Github SSH adapter for restricted networks Host github.com HostName ssh.github.com @@ -28,9 +5,26 @@ Host github.com Host gist.github.com HostName ssh.github.com - Port 443 + Port 443 -# IndustrialBrothers Internal network +# Home network +Host unifi + HostName Dream-Machine-Pro.local + User root + PubkeyAcceptedKeyTypes +ssh-rsa + HostKeyAlgorithms +ssh-rsa + +Host ewpratten-steamdeck + HostName ewpratten-steamdeck.local + User deck + ForwardX11 yes + +Host mc.homieho.me + User root + PreferredAuthentications password + PubkeyAuthentication no + +# IndustrialBrothers domain Host ib-* Hostname %h.industrialbrothers.com IdentityFile ~/.ssh/industrialbrothers_id_ed25519 @@ -38,7 +32,8 @@ Host ib-* User epratten Host *.industrialbrothers.com - IdentityFile ~/.ssh/industrialbrothers_id_ed25519 + IdentityFile ~/.ssh/industrialbrothers_id_ed25519 + User epratten Host ib-8700k-125 RemoteCommand powershell "& 'C:\Program Files\Git\bin\sh.exe' --login" @@ -48,9 +43,6 @@ Host ib-8700k-139 Host ib-rfcpu-002-lnx User evan -Host ib-rfcpu-001-lnx - User epratten - # Default hostnames I may encounter in the wild Host openrepeater.local HostName openrepeater.local @@ -75,4 +67,17 @@ Host atlas Host sheridan-cpanel User prattene HostName cpanel.prattene.dev.fast.sheridanc.on.ca + PubkeyAcceptedKeyTypes +ssh-rsa + HostKeyAlgorithms=+ssh-rsa +# NLNOG +Host *.ring.nlnog.net + User ewpratten + IdentitiesOnly yes + #IdentityFile ~/.ssh/id_ed25519_sk_rk.pub + +# SDF.org +Host *.sdf.org + user ewpratten + PreferredAuthentications password + PubkeyAuthentication no \ No newline at end of file diff --git a/helpers/install-ssh-config.sh b/helpers/install-ssh-config.sh new file mode 100644 index 0000000..ef1ed14 --- /dev/null +++ b/helpers/install-ssh-config.sh @@ -0,0 +1,13 @@ +#! /bin/sh +# Installs the SSH config file +set -e + +# Link the SSH config file +echo "Linking SSH config file..." +mkdir -p "$HOME/.ssh" +ln -sf "$(pwd)/configs/ssh/config" "$HOME/.ssh/config" + +# Set the correct permissions +echo "Setting SSH config file permissions..." +chmod 644 "$HOME/.ssh/config" +chown "$USER:$USER" "$HOME/.ssh/config" \ No newline at end of file diff --git a/install.conf.yaml b/install.conf.yaml index 1a66dc7..d795d26 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -27,6 +27,7 @@ - shell: - [git submodule update --init --recursive, Installing submodules] + - [sh ./helpers/install-ssh-config.sh, Installing SSH config] - [chmod +x configs/scripts/catto, Making catto executable] - [chmod +x configs/scripts/aspath, Making aspath executable] - [sh ./helpers/configure-gnome.sh, Configuring GNOME] \ No newline at end of file