merge

Signed-off-by: Tuan-Dat Tran <tuan-dat.tran@tudattr.dev>
2024-03-15 16:32:15 +01:00
parent 59e661e620 4c33229d30
commit 172702b289
72 changed files with 976 additions and 13182 deletions
--- a/config/.ssh/config
+++ b/config/.ssh/config
@@ -1,25 +1,21 @@
 # Services
-Host github.com
-    Hostname github.com
+Host github.com gitlab.com git.uni-due.de
    Port 22
    User git
    IdentityFile /mnt/veracrypt1/git

+Host github.com 
+    Hostname github.com
+
 Host gitlab.com
    Hostname gitlab.com
-    Port 22
-    User git
-    IdentityFile /mnt/veracrypt1/git
-
-Host picoCTF
-    HostName 2018shell4.picoctf.com
-    Port 22
-    User mos4
-    IdentityFile "/home/tuan/Documents/CTF/picoCTF/2018/30 - ssh-keyz/picoCTF"

 Host git.uni-due.de
    HostName git.uni-due.de
-    Port 22
+
+Host git.tudattr.dev
+    Hostname 192.168.20.12
+    Port 2222
    User git
    IdentityFile /mnt/veracrypt1/git

@@ -42,12 +38,34 @@ Host madrigal
     User tudattr
     IdentityFile /mnt/veracrypt1/mikrotik_rsa

-Host aya01
+Host inko inko.mii
+     HostName 192.168.20.14
+
+Host naruto naruto.mii
+     HostName 192.168.20.13
+
+Host pi pi.mii
+     HostName 192.168.20.11
+
+Host aya01 aya01.mii
    HostName 192.168.20.12
+
+Host behemoth behemoth.mii
+    User tuan
+    HostName 192.168.30.174
+
+Host mii 
+    HostName tudattr.dev
+
+Host inko.mii pi.mii aya01.mii naruto.mii behemoth.mii
+    ProxyJump mii
+
+Host mii pi aya01 inko naruto inko.mii pi.mii aya01.mii naruto.mii behemoth behemoth.mii
    Port 22
    User tudattr
    IdentityFile /mnt/veracrypt1/genesis

+<<<<<<< HEAD
 Host inko
    HostName 192.168.20.14
    Port 22
@@ -57,15 +75,26 @@ Host inko
 Host naruto
    HostName 192.168.20.13
    Port 22
+||||||| e9d53f0
+Host git.aya01
+    HostName 192.168.20.12
+    Port 23231
+=======
+# Work
+Host mini
+    HostName 100.76.45.158
+    Port 22
+>>>>>>> clean_emacs
    User tudattr
    IdentityFile /mnt/veracrypt1/genesis

-Host pi
-     HostName 192.168.20.11
-     Port 22
-     User tudattr
-     IdentityFile /mnt/veracrypt1/genesis
+Host tail-pi
+    HostName 100.93.79.94
+    Port 22
+    User tuant
+    IdentityFile /mnt/veracrypt1/work/minis

+<<<<<<< HEAD
 Host mii-root
     HostName 202.61.207.139
     Port 22
@@ -106,13 +135,22 @@ Host ncs-tailscale
    User tuant
    IdentityFile /mnt/veracrypt1/genesis

+||||||| e9d53f0
+# Work
+=======
+>>>>>>> clean_emacs
 Host ncs-head
    HostName 132.252.68.50
    Port 2122
    User tuan-dat.tran
    IdentityFile /mnt/veracrypt1/genesis
    ForwardX11 yes
+<<<<<<< HEAD
    ProxyJump ncs-tailscale
+||||||| e9d53f0
+=======
+    ProxyJump tail-pi
+>>>>>>> clean_emacs

 Host ncs-head-user
    HostName 132.252.68.50
@@ -123,62 +161,44 @@ Host ncs-head-user

 Host ncs2
    HostName 192.168.1.13
-    Port 22
    User tuan-dat.tran
+
+Host ncs2 ncs2-user ncs-node1 ncs-node2 ncs-node2-user ncs-node3 ncs-node4 ncs-node5 ncs-node6 ncs-node7 ncs-wedge
+    Port 22
    IdentityFile /mnt/veracrypt1/genesis
    ProxyJump ncs-head

 Host ncs2-user
    HostName 192.168.1.13
-    Port 22
    User user # tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/genesis
-    ProxyJump ncs-head

 Host ncs-node1
    HostName 192.168.1.11
-    Port 22
    User user
-    IdentityFile /mnt/veracrypt1/tudattr
-    ProxyJump ncs-head

 Host ncs-node2
    HostName 192.168.1.7
-    Port 22
    User tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/genesis
-    ProxyJump ncs-head
    ForwardX11 yes

 Host ncs-node2-user
    HostName 192.168.1.7
-    Port 22
    User user
-    IdentityFile /mnt/veracrypt1/tudattr
-    ProxyJump ncs-head

 Host ncs-node3
    Hostname 192.168.1.19
-    Port 22
    User tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/genesis
    ForwardX11 yes
-    ProxyJump ncs-head

 Host ncs-node3-user
    Hostname 192.168.1.19
-    Port 22
    User user
    IdentityFile /mnt/veracrypt1/tudattr
    ForwardX11 yes
-    ProxyJump ncs-head

 Host ncs-node4
    HostName 192.168.1.9
-    Port 22
    User tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/genesis
-    ProxyJump ncs-head

 Host ncs-node4-user
    HostName 192.168.1.9
@@ -189,18 +209,11 @@ Host ncs-node4-user

 Host ncs-node5
    HostName 192.168.1.15
-    Port 22
    User tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/genesis
-    ProxyJump ncs-head

 Host ncs-node6
    Hostname 192.168.1.17
-    Port 22
    User tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/genesis
-    # ForwardX11 yes
-    ProxyJump ncs-head

 Host ncs-node6-user
    Hostname 192.168.1.17
@@ -212,20 +225,53 @@ Host ncs-node6-user

 Host ncs-node7
    Hostname 192.168.1.18
-    Port 22
    User tuan-dat.tran
-    IdentityFile /mnt/veracrypt1/genesis
    ForwardX11 yes
-    ProxyJump ncs-head

 Host ncs-wedge
    Hostname 192.168.1.5
-    Port 22
    User user
+<<<<<<< HEAD
    IdentityFile /mnt/veracrypt1/genesis
    # ForwardX11 yes
    ProxyJump ncs-head

+||||||| e9d53f0
+    IdentityFile /mnt/veracrypt1/genesis
+    # ForwardX11 yes
+    ProxyJump ncs-head
+
+Host ncs-local-server
+    HostName 192.168.1.1
+    Port 22
+    User tuan-dat.tran
+    IdentityFile /mnt/veracrypt1/tudattr
+    StrictHostKeyChecking no
+
+Host ncs-local-server-user
+    HostName 192.168.1.1
+    Port 22
+    User user
+    IdentityFile /mnt/veracrypt1/tudattr
+    StrictHostKeyChecking no
+
+Host ncs-local-server2
+    HostName 192.168.2.2
+    Port 22
+    User user
+    IdentityFile /mnt/veracrypt1/tudattr
+    StrictHostKeyChecking no
+    ProxyJump ncs-local-server
+
+Host phone
+    Hostname 192.168.30.245
+    Port 2222
+    User tuan-dat.tran
+    IdentityFile /mnt/veracrypt1/genesis
+
+=======
+
+>>>>>>> clean_emacs
 Host ncs-gpu
    Hostname 192.168.1.21
    Port 22
@@ -234,18 +280,29 @@ Host ncs-gpu
    ForwardX11 yes
    ProxyJump ncs-head
    
+<<<<<<< HEAD
 Host ncs-aws-iperf3
    Hostname 18.185.5.191
    Port 22
    User ec2-user
    IdentityFile /mnt/veracrypt1/work/aws_ncs.pem

+||||||| e9d53f0
+Host ncs-aws-iperf3
+    Hostname 18.185.5.191
+    Port 22
+    User ec2-user
+    IdentityFile /mnt/veracrypt1/aws_ncs.pem
+
+=======
+>>>>>>> clean_emacs
 Host ami
    Hostname 3.72.156.214
    Port 22
    User ubuntu
    IdentityFile /mnt/veracrypt1/work/aws-rizk.pem

+<<<<<<< HEAD
 Host 5g-mec
    Hostname 192.168.100.1
    Port 22
@@ -264,3 +321,25 @@ Host minis
    User tudattr
    IdentityFile /mnt/veracrypt1/genesis

+||||||| e9d53f0
+=======
+
+## 5g IANA
+Host 5g-iana-mec
+    Hostname 192.168.100.1
+    Port 22
+    User udue
+    IdentityFile /mnt/veracrypt1/genesis
+
+Host uulm-obu0 uulm-obu1
+    Port 22
+    User user
+    ProxyJump 5g-iana-mec
+    IdentityFile /mnt/veracrypt1/genesis
+
+Host uulm-obu0 
+    Hostname 192.168.201.7
+
+Host uulm-obu1
+    Hostname 192.168.201.11
+>>>>>>> clean_emacs