From c337bbff8fcfd69877a37b794f2a6920caee6549 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 21 Sep 2022 14:02:47 +0800 Subject: [PATCH 1/7] perf: remove old warning msg --- data/caution.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/caution.txt b/data/caution.txt index 4e85670a1..3feabb2e4 100644 --- a/data/caution.txt +++ b/data/caution.txt @@ -1,2 +1 @@ - 你想偷看啥 ！！！ - What are you trying to peek at !!! \ No newline at end of file + What are you trying to peek at !!! From a4a671afd4f1d611b0cfc40aea838f609cf991e4 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 21 Sep 2022 14:04:16 +0800 Subject: [PATCH 2/7] docs: redirect to doc site --- docs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/README.md b/docs/README.md index e4d922911..e29c64391 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,3 +3,4 @@ ## 访问在线文档 [访问](https://docs.jumpserver.org) + From 3a196f08149ba93b452b8319cedf12e2bb96cf27 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 21 Sep 2022 14:05:04 +0800 Subject: [PATCH 3/7] chore: keep log dir on git --- logs/.gitkeep | 1 + 1 file changed, 1 insertion(+) diff --git a/logs/.gitkeep b/logs/.gitkeep index e69de29bb..8d1c8b69c 100644 --- a/logs/.gitkeep +++ b/logs/.gitkeep @@ -0,0 +1 @@ + From edfda5825cbb2c20a7986a1387ec2127bd9ea0c9 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 21 Sep 2022 14:05:47 +0800 Subject: [PATCH 4/7] chore: keep dir on git --- logs/.gitkeep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logs/.gitkeep b/logs/.gitkeep index 8d1c8b69c..1a4baf536 100644 --- a/logs/.gitkeep +++ b/logs/.gitkeep @@ -1 +1 @@ - + From 3dcfd0035aeefe6ddb4ddcb76a6e4fd0fd21aaee Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 21 Sep 2022 14:06:46 +0800 Subject: [PATCH 5/7] chore: add code of conduct --- CODE_OF_CONDUCT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 18c914718..04b8c547f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -126,3 +126,4 @@ enforcement ladder](https://github.com/mozilla/diversity). For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations. + From 2bd889e50537b61b5c1e075370e12eab706f6ea1 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 21 Sep 2022 14:07:23 +0800 Subject: [PATCH 6/7] chore: add english readme --- README_EN.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README_EN.md b/README_EN.md index bb2b15097..7f302195e 100644 --- a/README_EN.md +++ b/README_EN.md @@ -92,4 +92,3 @@ Licensed under The GNU General Public License version 3 (GPLv3) (the "License") https://www.gnu.org/licenses/gpl-3.0.htmll Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - From 8e7226d9dc4101dfab35661f2f4b513ec233f6e9 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 21 Sep 2022 14:09:28 +0800 Subject: [PATCH 7/7] pref: change run_server script --- Vagrantfile | 56 --------------------------------------------------- run_server.py | 3 +-- 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 Vagrantfile diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 98e82ca5a..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,56 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - # The most common configuration options are documented and commented below. - # For a complete reference, please see the online documentation at - # https://docs.vagrantup.com. - - # Every Vagrant development environment requires a box. You can search for - # boxes at https://vagrantcloud.com/search. - config.vm.box_check_update = false - config.vm.box = "centos/7" - config.vm.hostname = "jumpserver" - config.vm.network "private_network", ip: "172.17.8.101" - config.vm.provider "virtualbox" do |vb| - vb.memory = "4096" - vb.cpus = 2 - vb.name = "jumpserver" - end - - config.vm.synced_folder ".", "/vagrant", type: "rsync", - rsync__verbose: true, - rsync__exclude: ['.git*', 'node_modules*','*.log','*.box','Vagrantfile'] - - config.vm.provision "shell", inline: <<-SHELL -## 设置yum的阿里云源 -sudo curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-7.repo -sudo sed -i -e '/mirrors.cloud.aliyuncs.com/d' -e '/mirrors.aliyuncs.com/d' /etc/yum.repos.d/CentOS-Base.repo -sudo curl -o /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo -sudo yum makecache - -## 安装依赖包 -sudo yum install -y python36 python36-devel python36-pip \ - libtiff-devel libjpeg-devel libzip-devel freetype-devel \ - lcms2-devel libwebp-devel tcl-devel tk-devel sshpass \ - openldap-devel mariadb-devel mysql-devel libffi-devel \ - openssh-clients telnet openldap-clients gcc - -## 配置pip阿里云源 -mkdir /home/vagrant/.pip -cat << EOF | sudo tee -a /home/vagrant/.pip/pip.conf -[global] -timeout = 6000 -index-url = https://mirrors.aliyun.com/pypi/simple/ - -[install] -use-mirrors = true -mirrors = https://mirrors.aliyun.com/pypi/simple/ -trusted-host=mirrors.aliyun.com -EOF - -python3.6 -m venv /home/vagrant/venv -source /home/vagrant/venv/bin/activate -echo 'source /home/vagrant/venv/bin/activate' >> /home/vagrant/.bash_profile - SHELL -end diff --git a/run_server.py b/run_server.py index c7ec7bccb..b7cce251b 100644 --- a/run_server.py +++ b/run_server.py @@ -6,6 +6,5 @@ import subprocess if __name__ == '__main__': - subprocess.call('python3 jms start all', shell=True, - stdin=sys.stdin, stdout=sys.stdout) + subprocess.call('python3 jms start all', shell=True, stdin=sys.stdin, stdout=sys.stdout)