From bb8a30f99c0efe2911f1bb31fb2797847ad1d22a Mon Sep 17 00:00:00 2001
From: guohongze <guohongze@126.com>
Date: Wed, 9 Jan 2019 15:21:44 +0800
Subject: [PATCH] auto install webssh modify

---
 README.md                      |  1 +
 install/server/auto_install.sh | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2de3454f..c370986c 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ centos 7.2(1511) django 1.11.16 python 2.7<br>
 生产服务器建议 4核CPU，6G内存以上.<br>
 学习测试建议 2核CPU，2G内存以上.<br>
 服务器操作系统版本要求 centos7.2及以上<br>
+安装之前请关闭防火墙<br>
 ```
 git clone https://github.com/guohongze/adminset.git
 adminset/install/server/auto_install.sh
diff --git a/install/server/auto_install.sh b/install/server/auto_install.sh
index 124de60d..9664e496 100755
--- a/install/server/auto_install.sh
+++ b/install/server/auto_install.sh
@@ -49,12 +49,6 @@ else
 fi
 scp $adminset_dir/install/server/ansible/ansible.cfg /etc/ansible/ansible.cfg
 
-# install webssh
-cd $adminset_dir/vendor/webssh/
-/usr/bin/env python setup.py install
-scp /var/opt/adminset/main/install/server/webssh/webssh.service /usr/lib/systemd/system/webssh.service
-/bin/systemctl enable webssh.service
-
 #安装数据库
 echo "####install database####"
 echo "installing a new mariadb...."
@@ -102,6 +96,11 @@ source /etc/profile
 scp $adminset_dir/install/server/adminset.service /usr/lib/systemd/system
 /bin/systemctl enable adminset.service
 
+# install webssh
+cd $adminset_dir/vendor/webssh/
+/usr/bin/env python setup.py install
+scp /var/opt/adminset/main/install/server/webssh/webssh.service /usr/lib/systemd/system/webssh.service
+/bin/systemctl enable webssh.service
 
 #安装redis
 echo "####install redis####"