diff --git a/238.kebler.net/function/gateway b/238.kebler.net/function/gateway old mode 100644 new mode 100755 diff --git a/238.kebler.net/function/ssh-mounts/238 b/238.kebler.net/function/ssh-mounts/238 index e0f63a5..2ad5c7b 100644 --- a/238.kebler.net/function/ssh-mounts/238 +++ b/238.kebler.net/function/ssh-mounts/238 @@ -56,7 +56,7 @@ function mnttrantor() { smount sysadmin@trantor.kebler.net:/opt /mnt/238/trantor/opt -p 22 smount sysadmin@trantor.kebler.net:/mnt/data /mnt/238/trantor/data -p 22 smount root@trantor.kebler.net:/ /mnt/238/trantor/root -p 22 - smount sysadmin@trantor.kebler.net:/backup /mnt/238/trantor/backup -p 22 + smount root@trantor.kebler.net:/backup /mnt/238/trantor/backup -p 22 } function umnttrantor() { @@ -86,3 +86,19 @@ function mnt238hass() { function umnt238hass() { usmount /mnt/238/hass } + +function mntgeoff() { + smount sysadmin@geoff.net:/home/sysadmin /mnt/geoff/sysadmin -p 22 + smount geoff@geoff.net:/home/geoff /mnt/geoff/geoff -p 22 + smount root@geoff.net:/ /mnt/geoff/root -p 22 + smount sysadmin@geoff.net:/opt /mnt/geoff/opt -p 22 + smount sysadmin@geoff.net:/data /mnt/geoff/data -p 22 +} + +function umntgeoff() { + usmount /mnt/geoff/data + usmount /mnt/geoff/opt + usmount /mnt/geoff/root + usmount /mnt/geoff/geoff + usmount /mnt/geoff/sysadmin +} diff --git a/238.kebler.net/ssh/config/238.cfg b/238.kebler.net/ssh/config/238.cfg index 85c03dc..a605e96 100644 --- a/238.kebler.net/ssh/config/238.cfg +++ b/238.kebler.net/ssh/config/238.cfg @@ -9,146 +9,183 @@ ForwardX11Trusted yes ## router Host 238gate - user sysadmin - hostname gateway.238.kebler.net +user sysadmin +hostname gateway.238.kebler.net Host 238gater - user root - hostname gateway.238.kebler.net +user root +hostname gateway.238.kebler.net Host 238nas - user sysadmin - hostname nas.238.kebler.net - ForwardX11 yes +user sysadmin +hostname nas.238.kebler.net +ForwardX11 yes Host 238nasr - user root - hostname nas.kebler.net - ForwardX11 yes +user root +hostname nas.kebler.net +ForwardX11 yes Host 238water water - user sysadmin - hostname water.238.kebler.net +user sysadmin +hostname water.238.kebler.net Host 238waterr waterr - user root - hostname water.238.kebler.net +user root +hostname water.238.kebler.net Host 238hass 238ha - user root - hostname hassio.238.kebler.net - port 22 +user root +hostname hassio.238.kebler.net +port 22 Host 238hasshost 238hahost - user root - hostname hassio.238.kebler.net - port 22222 +user root +hostname hassio.238.kebler.net +port 22222 Host 238admin trantor - user sysadmin - hostname admin.238.kebler.net - ForwardX11 yes +user sysadmin +hostname admin.238.kebler.net +ForwardX11 yes Host 238adminr trantorr - user root - hostname admin.238.kebler.net - ForwardX11 yes +user root +hostname admin.238.kebler.net +ForwardX11 yes Host 288adminb trantorb - user root - hostname trantor.kebler.net - IdentityFile /mnt/AllData/secure/privatekeys/xfer.kebler.net - IdentitiesOnly yes +user root +hostname trantor.kebler.net +IdentityFile /mnt/AllData/secure/privatekeys/xfer.kebler.net +IdentitiesOnly yes # ServerAliveInterval 60 # ServerAliveCountMax 240 Host seldon printer - user sysadmin - hostname seldon.kebler.net - ForwardX11 yes +user sysadmin +hostname seldon.kebler.net +ForwardX11 yes Host rseldon - user root - hostname seldon.kebler.net - ForwardX11 yes +user root +hostname seldon.kebler.net +ForwardX11 yes # Lights Sytem Network # relays Host r238lights - user sysadmin - hostname lights.238.kebler.net - port 222 +user sysadmin +hostname lights.238.kebler.net +port 222 Host r238lightsr - user root - hostname lights.238.kebler.net - port 222 +user root +hostname lights.238.kebler.net +port 222 # switches Host s238lights - user sysadmin - hostname lights.238.kebler.net - port 122 +user sysadmin +hostname lights.238.kebler.net +port 122 Host s238lightsr - user root - hostname lights.238.kebler.net - port 122 +user root +hostname lights.238.kebler.net +port 122 # controller Host 238lights - user sysadmin - hostname lights.238.kebler.net - port 22 +user sysadmin +hostname lights.238.kebler.net +port 22 # root connections Host 238lightsr - user root - hostname lights.238.kebler.net - port 22 +user root +hostname lights.238.kebler.net +port 22 ## FOR ACCESS WHEN OUTSIDE 238 VIA NAT PORT FORWARDING WHEN VPN IS OFFLINE Host w238nas - user sysadmin - hostname 238.kebler.net - port 322 - ForwardX11 yes +user sysadmin +hostname 238.kebler.net +port 322 +ForwardX11 yes Host w238nasf - user sysadmin - hostname 238.kebler.net - port 322 - IdentityFile ~/.ssh/sysadmin.kebler.net - ForwardX11 yes +user sysadmin +hostname 238.kebler.net +port 322 +IdentityFile ~/.ssh/sysadmin.kebler.net +ForwardX11 yes Host w238nasr - user root - hostname 238.kebler.net - port 322 - ForwardX11 yes +user root +hostname 238.kebler.net +port 322 +ForwardX11 yes ## router Host w238gate - user sysadmin - hostname 238.kebler.net - IdentityFile ~/.ssh/sysadmin.kebler.net +user sysadmin +hostname 238.kebler.net +IdentityFile ~/.ssh/sysadmin.kebler.net Host w238gater - user root - hostname 238.kebler.net - IdentityFile ~/.ssh/sysadmin.kebler.net +user root +hostname 238.kebler.net +IdentityFile ~/.ssh/sysadmin.kebler.net # admin server trantor Host wtrantor - user sysadmin - hostname 238.kebler.net - port 222 - IdentityFile ~/.ssh/sysadmin.kebler.net +user sysadmin +hostname 238.kebler.net +port 222 +IdentityFile ~/.ssh/sysadmin.kebler.net Host wtrantorr - user root - hostname 238.kebler.net - port 222 - IdentityFile ~/.ssh/sysadmin.kebler.net +user root +hostname 238.kebler.net +port 222 +IdentityFile ~/.ssh/sysadmin.kebler.net + +## community center within 238 network + +Host ccavw +user sysadmin +hostname cc.gpccaor.net +port 222 +IdentityFile ~/.ssh/sysadmin.kebler.net + +Host ccav +user sysadmin +hostname av.cc.gpccaor.net +port 22 +IdentityFile ~/.ssh/sysadmin.kebler.net + +Host ccadmin +user sysadmin +hostname admin.cc.gpccaor.net +port 22 +IdentityFile ~/.ssh/sysadmin.kebler.net + +# other + +Host phone +user sysadmin +hostname 10.0.0.212 +port 8022 + +Host geoff +user sysadmin +hostname geoff.net +port 22 + +Host geoffr +user root +hostname geoff.net +port 22 diff --git a/all/modules/ssh.sh b/all/modules/ssh.sh index 36f73fb..7e04fd4 100644 --- a/all/modules/ssh.sh +++ b/all/modules/ssh.sh @@ -81,6 +81,16 @@ ssh() { fi } +sshp() { + local opts="-o PreferredAuthentications=password -o PubkeyAuthentication=no" + if [[ $SSH_CONFIG ]]; then + [[ ! -f "$SSH_CONFIG" ]] && ssh_config "$SSH_CONFIG" + command ssh $opts -F $SSH_CONFIG "$@" + else + command ssh $opts "$@" + fi +} + ssh_test() { echo running non-interactive ssh test on $2 with user $1 ssh $1@$2 "cat .bashrc" diff --git a/all/modules/sshfs.sh b/all/modules/sshfs.sh index 616bb33..f9cf730 100755 --- a/all/modules/sshfs.sh +++ b/all/modules/sshfs.sh @@ -23,7 +23,7 @@ function smount() { [[ ! -f "$SSH_CONFIG" ]] && ssh_config "$SSH_CONFIG" config=$([[ -f $SSH_CONFIG ]] && echo "-F $SSH_CONFIG") fi - # echo sshfs "$*" "$config" + # echo sshfs "$*" "$config" sshfs $* $config fi } @@ -36,3 +36,11 @@ function usmount() { echo "nothing mounted at $1, aborting unmount" fi } + +function mntBackup() { + smount root@$1:/backup /backup/remote -p 22 -o allow_other +} + +function umntBackup() { + usmount /backup/remote +}