Skip to content

Commit 496cee7

Browse files
wojiushixiaobaiwojiushixiaobai
committed
feat: 更新 v2.1.0 版本
1 parent 8e9f0b2 commit 496cee7

7 files changed

Lines changed: 66 additions & 62 deletions

File tree

‎config_example.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# 以下设置默认情况下不需要修改, 系统会自动生成随机字符串填入
22

33
# 需要安装的版本
4-
Version=2.1.0
4+
Version=v2.1.0
55

66
# Jms 加密配置
77
SECRET_KEY=

‎scripts/check_install_env.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ else
6161
fi
6262

6363
echo -ne "Version Check \t........................ "
64-
if [ "${Version:0:1}" -lt "2" ]; then
65-
echo -e "[\033[31m ERROR \033[0m] 请安装 JumpServer 2.0.0 以上版本, 不支持旧版本安装"
64+
if [ "${Version:1:1}" -lt "2" ]; then
65+
echo -e "[\033[31m ERROR \033[0m] 请安装 JumpServer v2.0.0 以上版本, 不支持旧版本安装"
6666
flag=1
6767
else
6868
echo -e "[\033[32m OK \033[0m]"

‎scripts/docker/daemon.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"registry-mirrors": ["https://hub-mirror.c.163.com", "https://bmtrgdvx.mirror.aliyuncs.com", "https://dockerhub.azk8s.cn", "https://hub.wuxiaobai.win"]
2+
"registry-mirrors": ["https://bmtrgdvx.mirror.aliyuncs.com", "https://hub-mirror.c.163.com", "https://dockerhub.azk8s.cn", "https://hub.wuxiaobai.win"]
33
}

‎scripts/install_core.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ function set_firewall() {
1111
}
1212

1313
function download_core() {
14-
if [ ! -f "$PROJECT_DIR/$Version/jumpserver-v$Version.tar.gz" ]; then
15-
wget -qO $PROJECT_DIR/$Version/jumpserver-v$Version.tar.gz http://demo.jumpserver.org/download/jumpserver/$Version/jumpserver-v$Version.tar.gz
14+
if [ ! -f "$PROJECT_DIR/$Version/jumpserver-$Version.tar.gz" ]; then
15+
wget -qO $PROJECT_DIR/$Version/jumpserver-$Version.tar.gz http://demo.jumpserver.org/download/jumpserver/$Version/jumpserver-$Version.tar.gz
1616
fi
17-
tar xf $PROJECT_DIR/$Version/jumpserver-v$Version.tar.gz -C $install_dir/ || {
18-
rm -rf $PROJECT_DIR/$Version/jumpserver-v$Version.tar.gz
17+
tar xf $PROJECT_DIR/$Version/jumpserver-$Version.tar.gz -C $install_dir/ || {
18+
rm -rf $PROJECT_DIR/$Version/jumpserver-$Version.tar.gz
1919
rm -rf $install_dir/jumpserver
2020
echo "[ERROR] 下载 jumpserver 失败"
2121
}
22-
mv $install_dir/jumpserver-v$Version $install_dir/jumpserver
22+
mv $install_dir/jumpserver-$Version $install_dir/jumpserver
2323
if [ "$(getenforce)" != "Disabled" ]; then
2424
restorecon -R $install_dir/jumpserver/data/
2525
fi

‎scripts/install_nginx.sh‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@ function install_nginx() {
1515
}
1616

1717
function download_lina() {
18-
if [ ! -f "$PROJECT_DIR/$Version/lina-v$Version.tar.gz" ]; then
19-
wget -qO $PROJECT_DIR/$Version/lina-v$Version.tar.gz http://demo.jumpserver.org/download/lina/$Version/lina-v$Version.tar.gz
18+
if [ ! -f "$PROJECT_DIR/$Version/lina-$Version.tar.gz" ]; then
19+
wget -qO $PROJECT_DIR/$Version/lina-$Version.tar.gz http://demo.jumpserver.org/download/lina/$Version/lina-$Version.tar.gz
2020
fi
21-
tar xf $PROJECT_DIR/$Version/lina-v$Version.tar.gz -C $install_dir/ || {
22-
rm -rf $PROJECT_DIR/$Version/lina-v$Version.tar.gz
21+
tar xf $PROJECT_DIR/$Version/lina-$Version.tar.gz -C $install_dir/ || {
22+
rm -rf $PROJECT_DIR/$Version/lina-$Version.tar.gz
2323
rm -rf $install_dir/lina
2424
echo "[ERROR] 下载 lina 失败"
2525
}
26-
mv $install_dir/lina-v$Version $install_dir/lina
26+
mv $install_dir/lina-$Version $install_dir/lina
2727
if [ "$(getenforce)" != "Disabled" ]; then
2828
restorecon -R $install_dir/lina/
2929
fi
3030
}
3131

3232
function download_luna() {
33-
if [ ! -f "$PROJECT_DIR/$Version/luna-v$Version.tar.gz" ]; then
34-
wget -qO $PROJECT_DIR/$Version/luna-v$Version.tar.gz http://demo.jumpserver.org/download/luna/$Version/luna-v$Version.tar.gz
33+
if [ ! -f "$PROJECT_DIR/$Version/luna-$Version.tar.gz" ]; then
34+
wget -qO $PROJECT_DIR/$Version/luna-$Version.tar.gz http://demo.jumpserver.org/download/luna/$Version/luna-$Version.tar.gz
3535
fi
36-
tar xf $PROJECT_DIR/$Version/luna-v$Version.tar.gz -C $install_dir/ || {
37-
rm -rf $PROJECT_DIR/$Version/luna-v$Version.tar.gz
36+
tar xf $PROJECT_DIR/$Version/luna-$Version.tar.gz -C $install_dir/ || {
37+
rm -rf $PROJECT_DIR/$Version/luna-$Version.tar.gz
3838
rm -rf $install_dir/luna
3939
echo "[ERROR] 下载 luna 失败"
4040
}
41-
mv $install_dir/luna-v$Version $install_dir/luna
41+
mv $install_dir/luna-$Version $install_dir/luna
4242
if [ "$(getenforce)" != "Disabled" ]; then
4343
restorecon -R $install_dir/luna/
4444
restorecon -R $install_dir/lina/
@@ -52,13 +52,7 @@ function start_nginx() {
5252

5353
function config_nginx() {
5454
echo > /etc/nginx/conf.d/default.conf
55-
if [ ! -f "$PROJECT_DIR/$Version/jumpserver.conf" ]; then
56-
wget -O $PROJECT_DIR/$Version/jumpserver.conf http://demo.jumpserver.org/download/nginx/conf.d/latest/jumpserver.conf || {
57-
rm -rf $PROJECT_DIR/$Version/jumpserver.conf
58-
echo "[ERROR] 下载 nginx 配置文件失败"
59-
}
60-
fi
61-
cp $PROJECT_DIR/$Version/jumpserver.conf /etc/nginx/conf.d/jumpserver.conf
55+
cp $BASE_DIR/nginx/jumpserver.conf /etc/nginx/conf.d/jumpserver.conf
6256
if [ "$http_port" != "80" ]; then
6357
sed -i "s@listen 80;@listen $http_port;@g" /etc/nginx/conf.d/jumpserver.conf
6458
fi
@@ -82,17 +76,11 @@ function main {
8276
if [ ! "$(systemctl status nginx | grep Active | grep running)" ]; then
8377
start_nginx
8478
fi
85-
if [ "${Version:0:1}" == "1" ]; then
86-
if [ ! -d "$install_dir/luna" ]; then
87-
download_luna
88-
fi
89-
elif [ "${Version:0:1}" == "2" ]; then
90-
if [ ! -d "$install_dir/lina" ]; then
91-
download_lina
92-
fi
93-
if [ ! -d "$install_dir/luna" ]; then
94-
download_luna
95-
fi
79+
if [ ! -d "$install_dir/lina" ]; then
80+
download_lina
81+
fi
82+
if [ ! -d "$install_dir/luna" ]; then
83+
download_luna
9684
fi
9785
}
9886

‎scripts/nginx/jumpserver.conf‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ server {
44

55
client_max_body_size 100m; # 录像及文件上传大小限制
66

7+
location /ui/ {
8+
try_files $uri / /index.html;
9+
alias /opt/lina/;
10+
expires 24h;
11+
}
12+
713
location /luna/ {
814
try_files $uri / /index.html;
915
alias /opt/luna/;
@@ -24,7 +30,7 @@ server {
2430
proxy_pass http://localhost:5000;
2531
proxy_buffering off;
2632
proxy_http_version 1.1;
27-
proxy_request_buffering off;
33+
proxy_request_buffering off;
2834
proxy_set_header Upgrade $http_upgrade;
2935
proxy_set_header Connection "upgrade";
3036
proxy_set_header X-Real-IP $remote_addr;
@@ -37,7 +43,7 @@ server {
3743
proxy_pass http://localhost:8081/;
3844
proxy_buffering off;
3945
proxy_http_version 1.1;
40-
proxy_request_buffering off;
46+
proxy_request_buffering off;
4147
proxy_set_header Upgrade $http_upgrade;
4248
proxy_set_header Connection $http_connection;
4349
proxy_set_header X-Real-IP $remote_addr;
@@ -47,22 +53,32 @@ server {
4753
}
4854

4955
location /ws/ {
50-
proxy_pass http://localhost:8070;
51-
proxy_buffering off;
56+
proxy_pass http://localhost:8070;
57+
proxy_buffering off;
5258
proxy_http_version 1.1;
53-
proxy_request_buffering off;
59+
proxy_request_buffering off;
5460
proxy_set_header Upgrade $http_upgrade;
5561
proxy_set_header Connection "upgrade";
5662
proxy_set_header X-Real-IP $remote_addr;
5763
proxy_set_header Host $host;
5864
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
5965
}
6066

67+
location /api/ {
68+
proxy_set_header X-Real-IP $remote_addr;
69+
proxy_set_header Host $host;
70+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
71+
proxy_pass http://localhost:8080;
72+
}
73+
74+
location /core/ {
75+
proxy_set_header X-Real-IP $remote_addr;
76+
proxy_set_header Host $host;
77+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
78+
proxy_pass http://localhost:8080;
79+
}
80+
6181
location / {
62-
proxy_pass http://localhost:8080;
63-
proxy_request_buffering off;
64-
proxy_set_header X-Real-IP $remote_addr;
65-
proxy_set_header Host $host;
66-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
82+
rewrite ^/(.*)$ /ui/$1 last;
6783
}
6884
}

‎scripts/upgrade.sh‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,35 +29,35 @@ if [ ! -d "$PROJECT_DIR/$Upgrade_Version" ]; then
2929
mkdir -p $PROJECT_DIR/$Upgrade_Version
3030
fi
3131

32-
if [ ! -f "$PROJECT_DIR/$Upgrade_Version/jumpserver-v$Upgrade_Version.tar.gz" ]; then
33-
wget -qO $PROJECT_DIR/$Upgrade_Version/jumpserver-v$Upgrade_Version.tar.gz http://demo.jumpserver.org/download/jumpserver/$Upgrade_Version/jumpserver-v$Upgrade_Version.tar.gz || {
34-
rm -rf $PROJECT_DIR/$Upgrade_Version/jumpserver-v$Upgrade_Version.tar.gz
32+
if [ ! -f "$PROJECT_DIR/$Upgrade_Version/jumpserver-$Upgrade_Version.tar.gz" ]; then
33+
wget -qO $PROJECT_DIR/$Upgrade_Version/jumpserver-$Upgrade_Version.tar.gz http://demo.jumpserver.org/download/jumpserver/$Upgrade_Version/jumpserver-$Upgrade_Version.tar.gz || {
34+
rm -rf $PROJECT_DIR/$Upgrade_Version/jumpserver-$Upgrade_Version.tar.gz
3535
echo -e "\033[31m 下载 jumpserver 失败, 请检查网络是否正常或尝试重新执行升级脚本 \033[0m"
3636
exit 1
3737
}
3838
fi
3939

4040
rm -rf $install_dir/lina*
41-
if [ ! -f "$PROJECT_DIR/$Upgrade_Version/lina-v$Upgrade_Version.tar.gz" ]; then
42-
wget -qO $PROJECT_DIR/$Upgrade_Version/lina-v$Upgrade_Version.tar.gz http://demo.jumpserver.org/download/lina/$Upgrade_Version/lina-v$Upgrade_Version.tar.gz|| {
43-
rm -rf $PROJECT_DIR/$Upgrade_Version/lina-v$Upgrade_Version.tar.gz
41+
if [ ! -f "$PROJECT_DIR/$Upgrade_Version/lina-$Upgrade_Version.tar.gz" ]; then
42+
wget -qO $PROJECT_DIR/$Upgrade_Version/lina-$Upgrade_Version.tar.gz http://demo.jumpserver.org/download/lina/$Upgrade_Version/lina-$Upgrade_Version.tar.gz|| {
43+
rm -rf $PROJECT_DIR/$Upgrade_Version/lina-$Upgrade_Version.tar.gz
4444
echo -e "\033[31m 下载 lina 失败, 请检查网络是否正常或尝试重新执行升级脚本 \033[0m"
4545
exit 1
4646
}
4747
fi
48-
tar -xf $PROJECT_DIR/$Upgrade_Version/lina-v$Upgrade_Version.tar.gz -C $install_dir
49-
mv $install_dir/lina-v$Upgrade_Version $install_dir/lina
48+
tar -xf $PROJECT_DIR/$Upgrade_Version/lina-$Upgrade_Version.tar.gz -C $install_dir
49+
mv $install_dir/lina-$Upgrade_Version $install_dir/lina
5050

5151
rm -rf $install_dir/luna*
52-
if [ ! -f "$PROJECT_DIR/$Upgrade_Version/luna-v$Upgrade_Version.tar.gz" ]; then
53-
wget -qO $PROJECT_DIR/$Upgrade_Version/luna-v$Upgrade_Version.tar.gz http://demo.jumpserver.org/download/luna/$Upgrade_Version/luna-v$Upgrade_Version.tar.gz|| {
54-
rm -rf $PROJECT_DIR/$Upgrade_Version/luna-v$Upgrade_Version.tar.gz
52+
if [ ! -f "$PROJECT_DIR/$Upgrade_Version/luna-$Upgrade_Version.tar.gz" ]; then
53+
wget -qO $PROJECT_DIR/$Upgrade_Version/luna-$Upgrade_Version.tar.gz http://demo.jumpserver.org/download/luna/$Upgrade_Version/luna-$Upgrade_Version.tar.gz|| {
54+
rm -rf $PROJECT_DIR/$Upgrade_Version/luna-$Upgrade_Version.tar.gz
5555
echo -e "\033[31m 下载 luna 失败, 请检查网络是否正常或尝试重新执行升级脚本 \033[0m"
5656
exit 1
5757
}
5858
fi
59-
tar -xf $PROJECT_DIR/$Upgrade_Version/luna-v$Upgrade_Version.tar.gz -C $install_dir
60-
mv $install_dir/luna-v$Upgrade_Version $install_dir/luna
59+
tar -xf $PROJECT_DIR/$Upgrade_Version/luna-$Upgrade_Version.tar.gz -C $install_dir
60+
mv $install_dir/luna-$Upgrade_Version $install_dir/luna
6161

6262
docker stop jms_koko jms_guacamole
6363
docker rm jms_koko jms_guacamole
@@ -74,8 +74,8 @@ if [ ! -f "$jumpserver_backup/$DB_NAME.sql" ]; then
7474
fi
7575

7676
if [ ! -d "$install_dir/jumpserver" ]; then
77-
tar -xf $PROJECT_DIR/$Upgrade_Version/jumpserver-v$Upgrade_Version.tar.gz -C $install_dir
78-
mv $install_dir/jumpserver-v$Upgrade_Version $install_dir/jumpserver
77+
tar -xf $PROJECT_DIR/$Upgrade_Version/jumpserver-$Upgrade_Version.tar.gz -C $install_dir
78+
mv $install_dir/jumpserver-$Upgrade_Version $install_dir/jumpserver
7979
fi
8080

8181
if [ ! -f "$install_dir/jumpserver/config.yml" ]; then

0 commit comments

Comments
 (0)