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. + 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. - 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/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 !!! 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) + diff --git a/logs/.gitkeep b/logs/.gitkeep index e69de29bb..1a4baf536 100644 --- a/logs/.gitkeep +++ b/logs/.gitkeep @@ -0,0 +1 @@ + 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)