From 40801c3397e3db5ce31eab84d43330c8e3797a22 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sun, 27 Oct 2019 18:33:05 +0800 Subject: [PATCH] Updated the topology --- VPN.dot | 35 +++++++++++++++++++++++++++++++++++ hosts | 20 +++++++++++++------- pubkey/NeoPDP11 | 16 ---------------- pubkey/NeoPortable | 15 --------------- pubkey/NeoSBC | 16 ---------------- pubkey/NeoWorkstation | 16 ---------------- pubkey/cklvax | 16 ---------------- pubkey/cschat | 16 ---------------- pubkey/ucbvax | 17 ----------------- tinc.conf | 3 +-- 10 files changed, 49 insertions(+), 121 deletions(-) create mode 100644 VPN.dot delete mode 100644 pubkey/NeoPDP11 delete mode 100644 pubkey/NeoPortable delete mode 100644 pubkey/NeoSBC delete mode 100644 pubkey/NeoWorkstation delete mode 100644 pubkey/cklvax delete mode 100644 pubkey/cschat delete mode 100644 pubkey/ucbvax diff --git a/VPN.dot b/VPN.dot new file mode 100644 index 0000000..de97433 --- /dev/null +++ b/VPN.dot @@ -0,0 +1,35 @@ +digraph "" +{ + labelloc="t"; + label="NeoNetwork OSPF Transit"; + rankdir=TD + node [shape=box] + c [label="caasih.nerdpol.ovh"] + ucbvax [label="ucbvax (sl-sgp.asn.yt)"] + np11 [label="NeoPDP-11"] + cklvax [label="cklvax"] + neobox [label="NeoBOX"] + local [label="192.168.9.0/24 (CRoom)"] + np [label="NeoPortable"] + nv [label="NeoVAX"] + home [label="192.168.0.0/24 (Home)"] + openwrt [label="Wi-Fi AP"] + + + NeoPMC1 -> local [dir=both] + NeoPMC2 -> local [dir=both] + NeoPMC3 -> local [dir=both] + NeoSYS -> local [dir=both] + NeoBOX -> local [dir=both] + NNPCC -> local [dir=both] + np11 -> c + np11 -> ucbvax + ucbvax -> c [dir=both] + cklvax -> local [dir=both] + neobox -> local [dir=both] + local -> np11 [dir=both] + np -> ucbvax + home -> np [dir=both] + openwrt -> home [dir=both] + nv -> home [dir=both] +} diff --git a/hosts b/hosts index 89ba4bc..551e665 100644 --- a/hosts +++ b/hosts @@ -1,7 +1,13 @@ -192.168.127.32 NeoSBC -192.168.127.48 ucbvax -192.168.127.56 cklvax -192.168.127.64 NeoVAX -192.168.127.80 NeoPDP-11 -192.168.127.86 NeoPortable -192.168.127.72 cschat +192.168.9.86 NeoPDP-11 +192.168.9.80 cklvax +192.168.9.89 NNPCC +192.168.9.45 NeoBOX +192.168.9.59 NeoPMC1 +192.168.9.60 NeoPMC2 +192.168.9.61 NeoPMC3 +192.168.9.47 NeoSYS +192.168.9.58 NNCPP +192.168.85.2 NeoPortable +192.168.86.2 ucbvax +192.168.96.2 caasih + diff --git a/pubkey/NeoPDP11 b/pubkey/NeoPDP11 deleted file mode 100644 index 6708465..0000000 --- a/pubkey/NeoPDP11 +++ /dev/null @@ -1,16 +0,0 @@ -Subnet=192.168.127.80/32 -Address=NeoPDP-11 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAwjGraq5eoWHzQVnsjtPj7DlDtd+o7BQ/0+Z9PYJOMr6bfReoyN4q -uCLVUts+7dfJ0L95yJy3LZqdUofIChvknVWAAdnFyLC5XGqn7Np5b6lSEbOOUBEE -Y2GKFwEVQyDK6DOB44BznhzoTeUCKfAcFNSUjUDqSFObwEVknJHM2EmNtWFhHa6J -+Ybiu/DKyE+uMJtaQbYZ80BfyHNUbiuU0sTPCYwtc+rlVVEWOKboaZKyjB3UCRUw -TfV55kERJ3cfCcqng8UjQTg8Gf7ZTbUNrm8tMpeGznuH22aKrj6wKJe5ENiGD1jq -huzcB71z8JiDiJsHrTtef9DkcBq/bc4Te2T5BAE3dVS/ig/aY24PU2u5bKDNt5Jc -wnFnKVEtFu37AFEc+wG0dnYwDsKhppkLI/nhbA/w2TrPFwo/ksbKr2j6bgpepkdc -BZmD4c1zICSc85cM0CQyVPIS1SxDWBTyo8CHgyXP43wkSNGFYNXZ1ejR5IGm0KwJ -76OxgIjo5GkPZmHu7WV0C0fpHlKQAWK3rrBPWIxzYOH+/au6w08ZH4szlV8DqymI -JZXmkm6xxZUiSc3D0wmVlmZHD8BmnAXRQ31ii+SKXsUrahvzQbNAksiDvmvwLQkU -K+/QHoCg3WCpvV16+r4b3BbxZS07p2BEg2YEqhPK8I4M9q75bgp8hwsCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/pubkey/NeoPortable b/pubkey/NeoPortable deleted file mode 100644 index bdf699f..0000000 --- a/pubkey/NeoPortable +++ /dev/null @@ -1,15 +0,0 @@ -Subnet=192.168.127.86/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEA3osC+Eo37v3wB3Gakep6dhFQQFgCpUm7ySnahJGMNDXaZs8rrt8m -72AFuf0OiepPgS8fFTcy+RorQlSgvYtaOIiS0/roAgK+5sXMCoQ/H5yx/A6n3Yts -724udNvcgxh0zpLUWvSx1R+cGPvVbixb/qfj2ooz8eUzQVZwwPEOswc23YHvhiQO -+LEx0f1ra6Rov42/McC4C1GbbcPV4BF3qeWn6uknq2DLen5wAWlCRoEoHgL7oe3g -W8F0gbgaZXSlE2GyNjLab+ufojRmx348qKNVyxNJ6RHekjjdfdubNjrxg0JTSTjC -xQS6cpifF6Kl2qkZ/zTkC8tdReloYeOorx3vdNy6Np4pAz4IdtgQUpifIoceeQ4Z -+sM29tMcZqCpFG620MJTKIuHv3Rty3p1hU3e0Hqo+DI58hhnrWSlaSzdTbMDnV4G -LerNCi4QpmdB6Xu1ax9o61/b0P7VVEIsyIFpanbiUvAvA+ximcC/rnkwpCmhYTs9 -V2afCfqP6mpuxxPsMV6ihzhGEo5oYgd4T1fQAFL0LKymuKDX/EaRb8WPcyYtdVHK -JO1pLLUuxOG8WqWEHnDEuxafaFY28m1/gELUPvjUvrKtg9Lox1XouSpyXgdeVAK6 -K+H2Mu0F93vkWB0al+ZhH5vP7Yfdmoc3H7K1sGuQh3InyAVbUb7k2wkCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/pubkey/NeoSBC b/pubkey/NeoSBC deleted file mode 100644 index ff36f74..0000000 --- a/pubkey/NeoSBC +++ /dev/null @@ -1,16 +0,0 @@ -Address=NeoSBC -Subnet=192.168.127.40/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAzMm7A9dRa3TZ5PTWrb1QxSFR3LCDHQxG+LsArsKLtHl9n0pzxq9z -DnE/o3BFuaGT4kpU8hrZf6TFJggP1F8IFNYEPGaMCB3Jk1HjgQqZlZJYt8Su6uzb -LrmZR9JSlwDL/yfpd3/2LOUHJELScyfnm0edzC64g1RHgAORUgsacXil0i8W6jbB -Z5JSd2t8LuMrrU/r7aiHjbgCeinyNYEL7P1jZ1LXUJa4gov8/sJulG8yhhSekJZ7 -2mcQQM99BhQ7ypil3rbRhCN9noFy05X8fGom8Xv7dktJ4L7+DoxEESkmUFZ4CDFj -UfnGeE7Tu+wPC0QVWa1SynmF5dlc8/wKEAPt9Y+IQMFK93ByjI0Uv53Zaonl5VDf -InERwIm/UQH8YuwSlmlHoV7ce9a3lrLqtYdxUGVYF81JYyqEarboOSAv/MQqRQGN -j9UM5gVEnQGKfEDUU+/ndlzx4e91uja5AnmUYk+GlYkhvjS60RueCU45K180lSov -m6j3JMJIN+rTh0/cfRqW1Ext9ZFXmKMQBC1ojm8tfzW9DWLERI3hF+cT4u+njJnz -ozIUjstW6/A2PpetkIHneLRGXihQXmrMaeFj3f4JjyUk850rvsCVd/2dsFiDdhNG -UBbcqCFbqlli/8cJftDYB5bK1g9uf0BMstEdWt3dYIL7Z4uSGv/MpOsCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/pubkey/NeoWorkstation b/pubkey/NeoWorkstation deleted file mode 100644 index 325b165..0000000 --- a/pubkey/NeoWorkstation +++ /dev/null @@ -1,16 +0,0 @@ -Address=NeoVAX -Subnet=192.168.127.63/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAuBVOVIfKCb3Fuvgfbi+nnvsWxI13tispQAQrX7auFilRQulCEl7x -UfXKJ7VZEt26ncgbwwcxvxOWxn+/gE5yr+56W1sY2OCgQ3xCGPIc52aYeV+BuXoG -X5FIPrLDfQR9xCuqKKr7GYjasJySK5odc8J7n+nPTXZZy0RgB4PtaMZpmq+J5wK4 -9r5OiIWmWnO3d34yIkoavH4xhpfmDLqJP5y1bn+wloPmh6AEaPGH/SBJCQAjWAOz -hystc5YU2SH90YKBoalUkBJblSNMfe1V+xuQr2fc7TAtwbML7sXp9C16LLdYxMiF -cua/ihvHoAPgry9/LgD6LigZweZFedyerBiHUbIGnBBpQdjJ8mjziuYhJNu680x8 -9ESKRdHVI+zMOeacTY/CnhVH6HGsOHiHwROPGI4q8roGgT4V3RmXhFUoB1qa2bex -mZFbg/hH6rcXkrqo45vRXxRP2zgqO7CW0yH+rZwu2Mc714aWQt/8vhS60FddPrDf -TdDwn1Ve2mCWfSZk/ak3vTJAn+eK9Y3NYSLuSqfFYIY9+uOlBK7N+y/pQhhOx4Qt -XTa5Klt/N1BsBIB127FaiJoe5A+2Z9OZfs/w5Ls4hW+Gzib3ZY5DIWuLXByzB5uM -e48f4eOvwPZ677cKHlFELEFYLc7HjsL9az5vTk2vVq0QgC/mtxUo4+cCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/pubkey/cklvax b/pubkey/cklvax deleted file mode 100644 index d55f546..0000000 --- a/pubkey/cklvax +++ /dev/null @@ -1,16 +0,0 @@ -Address=cklvax -Subnet=192.168.127.56/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAuJY6+O7TqvqcGs+r0v8kCkxfbBzP+qby3pCXuJzQ3X9AXexatwa8 -UFuDPldtsQcxwAfpwoaWtl7kcHHKn7MDNKvP6sk8vWd529XAIfdujwQwhTyuojvg -1E/n1vgNtxbEhzzhCXGN7hffMN1M6IcQWBn1anDsawcwWBojEypCGA6+wIw2bjo2 -KRON4lZzE4iTVOvGU0hAdAMUco5c+nZJ1+N/n7dolFZBx1t80XSb8DZe7kySfvE8 -tUlfwmZS+6dOS/4PHTw4Dqeg/Xuhw/AF4cYdlPOavoKaWrdhrhDm4dQ1uU0DGVGv -cnsru04bkbdLVr/0YDj8w1mre6An5vGApiiz223/g/ZsTdQy4ZmsZgQ6KlyQ1hJK -DReYFWGYZny1dXiJtDmSkKFqG5NMPQ6221vnSuqb+zdEtMHu/NUiWMKCtgC2lHOQ -3ZRYF7QBKbH/uEoe/khHiNBkqJK6JA16Na/V7S8yfUNLy0eggRiVUeOoo1w51sMj -DXkSicqEXKRK/dEfVv9XJBVD5Q8cbeSZsgDxbIMhhJ8dYQHZ1vP20jXu76vN4Bet -v88MxB7puYOgaiQWGsL15aDBYyLO48qPNTkLcltrghPwBbdPKFn9qFV+/MkGILy3 -MWpWbNQjClvvt1jSXOGO0BF0n0Ff1Zj3jCJmEPsUoh9Ae+CJLTglxbMCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/pubkey/cschat b/pubkey/cschat deleted file mode 100644 index 4a3095e..0000000 --- a/pubkey/cschat +++ /dev/null @@ -1,16 +0,0 @@ -Subnet=192.168.127.72/32 -Address=2a03:b0c0:3:e0::a:c001 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAunpgaSQJ7IkPQQcYTYkyLVlVkP7BgEdMPSFib/ixjqE8PO/hBGD3 -sIhVLUurgD/MfYyLg9grT0U78p1Sjs7/nGEJmWcm/CmGrquA2qR/hJ0F+4QRWuL8 -5upa/hVhcJue+BRD0ho1V1fe1QckhWrB5Z8X7jUioh/hgoE5EZanSiyMTWGNGGQv -5RS4Sdcb2XdWwkjaUjuzdQ9/XR+GLKkEHEkDXTzzXS6gzuNG80R1m1iFnpNs5Qk1 -5d7lHchbT94e6CUS0J5HEGZ4xfWjXhjtghnXSwI+6ZxYFoOCj9p+vwBVLZV1cU6n -syPIapHTtGdW+We3a5PMpMOJmw8YhMHbPYHNb8Ymr/N9H0jXyRnMBSr270eTKHWO -x4Nk5EezZBw6OrzSwaMpBkU99iU4DAqb8gdE5ac+qqEweT9wR4z75xRArwwX1MM3 -yzmAO0rnw2+fX6+TPZCdeSNVoJSSrU4oYQJwfwxSPXJ2OHLauIQKUJ0M2LUrZX2W -OFv3z9+dgzi2PNPTUgzeueQ0SUEXNoIeZEGgzF6Dr8EQj+jLSSB30WB2+asNoK7K -ZcMhf1j2pZCMLogtXipfSVieSBV5H04NCgIX5d89CiwBv/elzDOETSb2kMapYt0n -3HDTNQJqRvqLMJOiuvsOUamMkvpADjnZZhAIC/I7Xk1bHN92tm7YGQkCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/pubkey/ucbvax b/pubkey/ucbvax deleted file mode 100644 index aa0c27a..0000000 --- a/pubkey/ucbvax +++ /dev/null @@ -1,17 +0,0 @@ -Address=sl-sgp.asn.yt -Port=65432 -Subnet=192.168.127.48/32 - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAsbXkmMFHhaqwvxM7Tt2TIyBDiNf0YSmNQbIkldRFyQfTkCkQOX9D -gPfWnMDr/x5R5jA1evZ5THlsDbbvtOKsFyEVjmEvE06S4zec0VkVV4x6n0y6xlcd -CS4TLphh7MUcx3IoiGHWDU36c5QZfBlfr/coxge5jHGaOLc4VeZQAUE7i52I/Ye/ -wp+Gel+0ZRi/YeSOZY65DUl4M5NKJ4o5hGVJaSy/ihflJbnitEOvEs6CgKJwLO5V -nMusJ151pec+CVKNK/ci2n4syWzIdHjbfXLQ8h67axgXnCssR/qodQHMGtAhiiEo -Ju+hzuEtJMesrc+PSE5mSsEp8ulWEPd4gIol/q9MI8x7q1QEqNevRyUKBZyqbBBP -s1A8K8pdBD+PXG5CSI4Gvla9pn5wMcpWLnyef+OM4kaA5kzfOz4kd5P9f5JOro/k -8EDYDggSlm4WD1vhYGDZ8aKMtebZACL0TRlh/m/wgeGODhB9Y6oC1STVVn8FS8x1 -ux5KnjVjIe/twyLZ8p6/UZOlpDQWbX9LiOCFlT/7VAe/tEtbLKZnYGK3HOykLOH5 -3Cj6pGftj3kI9LrShDWQL0YR/ZyNAzc27P3V7m9oTxT8GyudKQPx+ocbb5ANnh1U -2gAdI+pKYxxFtAeX13FMHfadw85Pza3iMiDhjSVLAhZ/VmHwJDT9AtMCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/tinc.conf b/tinc.conf index 4dba99e..ecb24ce 100644 --- a/tinc.conf +++ b/tinc.conf @@ -1,4 +1,3 @@ Name= -Digest=sha512 -Cipher=chacha20 +Mode=switch ConnectTo=