feat: add Estelle

AOSC-Dev · Jul 23, 2024 · fe9c528 · fe9c528
1 parent 4ac3404
commit fe9c528
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 6 deletions.
diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        port: [22, 22040, 22041, 22042, 22043, 22076, 22162, 22238, 22333, 23269, 23333, 23541, 23999, 24114, 24222, 24242, 24426, 24612, 24808, 25202, 25888, 26128, 26666, 26999, 27001, 27221, 27224, 27282, 27514, 27777, 27863, 27888, 28002, 28003, 28004]
+        port: [22, 22040, 22041, 22042, 22043, 22076, 22162, 22238, 22333, 23269, 23333, 23541, 23999, 24114, 24222, 24242, 24426, 24612, 24808, 25202, 25888, 26128, 26397, 26666, 26999, 27001, 27221, 27224, 27282, 27514, 27777, 27863, 27888, 28002, 28003, 28004]
         host: ["relay.aosc.io", "relay-inet.aosc.io", "relay-cn.aosc.io"]
       fail-fast: false
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,6 +43,7 @@ jobs:
           ssh-keyscan -qp 25202 -T 240 relay.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 25202 -T 240 relay.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 25888 -T 240 relay.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 25888 -T 240 relay.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26128 -T 240 relay.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26128 -T 240 relay.aosc.io >> ssh_known_hosts.new
+          ssh-keyscan -qp 26397 -T 240 relay.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26397 -T 240 relay.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26666 -T 240 relay.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26666 -T 240 relay.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26999 -T 240 relay.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26999 -T 240 relay.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 27001 -T 240 relay.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 27001 -T 240 relay.aosc.io >> ssh_known_hosts.new
@@ -78,6 +79,7 @@ jobs:
           ssh-keyscan -qp 25202 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 25202 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 25888 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 25888 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26128 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26128 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new
+          ssh-keyscan -qp 26397 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26397 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26666 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26666 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26999 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26999 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 27001 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 27001 -T 240 relay-inet.aosc.io >> ssh_known_hosts.new
@@ -113,6 +115,7 @@ jobs:
           ssh-keyscan -qp 25202 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 25202 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 25888 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 25888 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26128 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26128 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new
+          ssh-keyscan -qp 26397 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26397 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26666 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26666 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 26999 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 26999 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new
           ssh-keyscan -qp 27001 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new || ssh-keyscan -p 27001 -T 240 relay-cn.aosc.io >> ssh_known_hosts.new

diff --git a/ssh_config b/ssh_config
@@ -123,7 +123,13 @@ Host power8
 Host ChubbyHydra chubbyhydra
   HostName relay.aosc.io
   Port 26128
-  User debian
+  User root
+  UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
+  GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
+Host Estelle estelle
+  HostName relay.aosc.io
+  Port 26397
+  User root
   UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
   GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
 Host GreenGoo greengoo
@@ -330,7 +336,13 @@ Host power8-inet
 Host ChubbyHydra-inet chubbyhydra-inet
   HostName relay-inet.aosc.io
   Port 26128
-  User debian
+  User root
+  UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
+  GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
+Host Estelle-inet estelle-inet
+  HostName relay-inet.aosc.io
+  Port 26397
+  User root
   UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
   GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
 Host GreenGoo-inet greengoo-inet
@@ -537,7 +549,13 @@ Host power8-ipv6
 Host ChubbyHydra-ipv6 chubbyhydra-ipv6
   HostName relay-ipv6.aosc.io
   Port 26128
-  User debian
+  User root
+  UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
+  GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
+Host Estelle-ipv6 estelle-ipv6
+  HostName relay-ipv6.aosc.io
+  Port 26397
+  User root
   UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
   GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
 Host GreenGoo-ipv6 greengoo-ipv6
@@ -744,7 +762,13 @@ Host power8-cn
 Host ChubbyHydra-cn chubbyhydra-cn
   HostName relay-cn.aosc.io
   Port 26128
-  User debian
+  User root
+  UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
+  GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
+Host Estelle-cn estelle-cn
+  HostName relay-cn.aosc.io
+  Port 26397
+  User root
   UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
   GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
 Host GreenGoo-cn greengoo-cn
@@ -951,7 +975,13 @@ Host power8-cn-ipv6
 Host ChubbyHydra-cn-ipv6 chubbyhydra-cn-ipv6
   HostName relay-cn-ipv6.aosc.io
   Port 26128
-  User debian
+  User root
+  UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
+  GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
+Host Estelle-cn-ipv6 estelle-cn-ipv6
+  HostName relay-cn-ipv6.aosc.io
+  Port 26397
+  User root
   UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2 ~/.ssh/known_hosts.d/aosc
   GlobalKnownHostsFile /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 /etc/ssh/ssh_known_hosts.d/aosc __PROGRAMDATA__\ssh\ssh_known_hosts __PROGRAMDATA__\ssh\ssh_known_hosts2 __PROGRAMDATA__\ssh\ssh_known_hosts.d\aosc
 Host GreenGoo-cn-ipv6 greengoo-cn-ipv6