From 61345a2f9e80d7fe617bfe391e2b514d2825e913 Mon Sep 17 00:00:00 2001
From: zhangxuantong <zhangxuantong@ihep.ac.cn>
Date: Mon, 21 Oct 2024 10:56:44 +0800
Subject: [PATCH] update ssh config
---
bootstrap.sh | 2 +-
bootstrap_remote.sh | 2 +-
src/{config_wsl => ssh.config} | 1 -
tools/setdocker.py | 3 +--
tools/setsettings.py | 3 +--
5 files changed, 4 insertions(+), 7 deletions(-)
rename src/{config_wsl => ssh.config} (90%)
diff --git a/bootstrap.sh b/bootstrap.sh
index 0c3e223..61e0fea 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -147,7 +147,7 @@ function boot_wsl(){
mv -f ~/.ssh/config ~/.ssh/config.bck
fi
rm -f ~/.ssh/config
- yes | cp -f $PWD/src/config_wsl ~/.ssh/config &>/dev/null
+ yes | cp -f $PWD/src/ssh.config ~/.ssh/config &>/dev/null
}
function --help(){
diff --git a/bootstrap_remote.sh b/bootstrap_remote.sh
index 4bc71fb..bfef4fb 100755
--- a/bootstrap_remote.sh
+++ b/bootstrap_remote.sh
@@ -40,7 +40,7 @@ else
;;
*)
remote_command=$1
- echo -e "Executing \e[31m$remote_command\e[0m ..."
+ echo -e "Command to execute \e[31m$remote_command\e[0m ..."
;;
esac
fi
diff --git a/src/config_wsl b/src/ssh.config
similarity index 90%
rename from src/config_wsl
rename to src/ssh.config
index 85e57de..a71915e 100644
--- a/src/config_wsl
+++ b/src/ssh.config
@@ -5,7 +5,6 @@ ControlMaster auto
ControlPersist 5
ForwardX11 yes
ForwardX11Trusted yes
-PreferredAuthentications publickey,keyboard-interactive,password
Host ihep.cc
User root
diff --git a/tools/setdocker.py b/tools/setdocker.py
index 5fb0598..a95b7ba 100755
--- a/tools/setdocker.py
+++ b/tools/setdocker.py
@@ -1,8 +1,7 @@
#!/usr/bin/python3
import json
import argparse
-import os, sys
-import copy
+import os
parser = argparse.ArgumentParser()
parser.add_argument("--proxy", type = str, default = "http://192.168.32.92:7890")
diff --git a/tools/setsettings.py b/tools/setsettings.py
index ae2fd2e..b9bba17 100755
--- a/tools/setsettings.py
+++ b/tools/setsettings.py
@@ -1,7 +1,6 @@
#!/usr/bin/python3
import json
-import os, sys
-import copy
+import sys
def merge_list(old_list, new_list):
merged_list = old_list + new_list
--
GitLab