diff --git a/docs/setup_by_ubuntu.rst b/docs/setup_by_ubuntu.rst index 57774bb1e7feebb9c215f5bdc865ada2973b9d87..f14273e49be4a026ce93a224972ede35846af21c 100644 --- a/docs/setup_by_ubuntu.rst +++ b/docs/setup_by_ubuntu.rst @@ -403,7 +403,7 @@ Luna 已改为纯å‰ç«¯ï¼Œéœ€è¦ Nginx æ¥è¿è¡Œè®¿é—® $ ./configure --with-init-dir=/etc/init.d $ make && make install $ cd .. - $ rm -rf guacamole-server-0.9.14.tar.gz guacamole-server-0.9.14 \ + $ rm -rf guacamole-server-0.9.14 \ $ ldconfig $ mkdir -p /config/guacamole /config/guacamole/lib /config/guacamole/extensions # 创建 guacamole 目录 @@ -430,8 +430,6 @@ Luna 已改为纯å‰ç«¯ï¼Œéœ€è¦ Nginx æ¥è¿è¡Œè®¿é—® $ export JUMPSERVER_SERVER=http://127.0.0.1:8080 # http://127.0.0.1:8080 指 jumpserver è®¿é—®åœ°å€ $ echo "export JUMPSERVER_SERVER=http://127.0.0.1:8080" >> ~/.bashrc - $ export JUMPSERVER_ENABLE_DRIVE=true - $ echo "export JUMPSERVER_ENABLE_DRIVE=true " >> ~/.bashrc $ export JUMPSERVER_KEY_DIR=/config/guacamole/keys $ echo "export JUMPSERVER_KEY_DIR=/config/guacamole/keys" >> ~/.bashrc $ export GUACAMOLE_HOME=/config/guacamole diff --git a/docs/start_automatically.rst b/docs/start_automatically.rst index 42a6e452162c8d7ab975d1d0c765689a99a1da44..ba3a8748debfc50271ebc3ec5efed9a419e76f58 100644 --- a/docs/start_automatically.rst +++ b/docs/start_automatically.rst @@ -7,7 +7,7 @@ :: # å¯åЍ - $ vim /opt/start_jms.sh + $ vi /opt/start_jms.sh #!/bin/bash set -e @@ -28,10 +28,19 @@ fi echo -e "\033[31m æ£å¸¸å¯åЍ Jumpserver ... \033[0m" + + # jumpserver source $Project/py3/bin/activate cd $Project/jumpserver && ./jms start -d + + # guacamole + export GUACAMOLE_HOME=/config/guacamole + export JUMPSERVER_KEY_DIR=/config/guacamole/keys + export JUMPSERVER_SERVER=http://127.0.0.1:8080 /etc/init.d/guacd start cd /config/tomcat8/bin && ./startup.sh + + # coco cd $Project/coco && ./cocod start -d exit 0 @@ -39,7 +48,7 @@ :: # åœæ¢ - $ vim /opt/stop_jms.sh + $ vi /opt/stop_jms.sh #!/bin/bash set -e @@ -68,7 +77,7 @@ Docker ç»„ä»¶éƒ¨ç½²è®¾ç½®è‡ªå¯ :: # å¯åЍ - $ vim /opt/start_jms.sh + $ vi /opt/start_jms.sh #!/bin/bash set -e @@ -99,7 +108,7 @@ Docker ç»„ä»¶éƒ¨ç½²è®¾ç½®è‡ªå¯ :: # åœæ¢ - $ vim /opt/stop_jms.sh + $ vi /opt/stop_jms.sh #!/bin/bash set -e diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index c85019010ab8c362afeb5d2676c844a67eb075a5..9535c9a7a40146314f18af93cd15d48e4a647d13 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -17,13 +17,18 @@ - 系统: CentOS 7 - IP: 192.168.244.144 -- å…³é— selinux 和防ç«å¢™ +- 设置 selinux 和防ç«å¢™ :: # CentOS 7 - $ setenforce 0 # 临时关é—,é‡å¯åŽå¤±æ•ˆ - $ systemctl stop firewalld.service # 临时关é—,é‡å¯åŽå¤±æ•ˆ + $ firewall-cmd --zone=public --add-port=80/tcp --permanent # nginx ç«¯å£ + $ firewall-cmd --zone=public --add-port=2222/tcp --permanent # 用户SSHç™»å½•ç«¯å£ coco + + $ firewall-cmd --reload # 釿–°è½½å…¥è§„则 + + $ setenforce 0 + $ sed -i "s/enforcing/disabled/g" `grep enforcing -rl /etc/selinux/config` # 修改å—符集,å¦åˆ™å¯èƒ½æŠ¥ input/output errorçš„é—®é¢˜ï¼Œå› ä¸ºæ—¥å¿—é‡Œæ‰“å°äº†ä¸æ–‡ $ localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8 @@ -88,7 +93,7 @@ :: $ cd /opt/ - $ git clone https://github.com/jumpserver/jumpserver.git && cd jumpserver && git checkout master + $ git clone https://github.com/jumpserver/jumpserver.git $ echo "source /opt/py3/bin/activate" > /opt/jumpserver/.env # 进入 jumpserver 目录时将自动载入 python 虚拟环境 # 首次进入 jumpserver 文件夹会有æç¤ºï¼ŒæŒ‰ y å³å¯ @@ -138,10 +143,11 @@ :: - $ mysql + $ mysql -uroot > create database jumpserver default charset 'utf8'; > grant all on jumpserver.* to 'jumpserver'@'127.0.0.1' identified by 'weakPassword'; > flush privileges; + > quit **2.7 修改 Jumpserver é…置文件** @@ -243,7 +249,7 @@ :: $ cd /opt/jumpserver/utils - $ bash make_migrations.sh + $ sh make_migrations.sh **2.9 è¿è¡Œ Jumpserver** @@ -267,7 +273,7 @@ $ cd /opt $ source /opt/py3/bin/activate - $ git clone https://github.com/jumpserver/coco.git && cd coco && git checkout master + $ git clone https://github.com/jumpserver/coco.git $ echo "source /opt/py3/bin/activate" > /opt/coco/.env # 进入 coco 目录时将自动载入 python 虚拟环境 # 首次进入 coco 文件夹会有æç¤ºï¼ŒæŒ‰ y å³å¯ @@ -415,11 +421,11 @@ Guacamole éœ€è¦ Tomcat æ¥è¿è¡Œ :: - $ yum -y localinstall --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm $ rpm --import http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro $ rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm + $ yum -y localinstall --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm - $ yum install -y git gcc java-1.8.0-openjdk libtool + $ yum install -y java-1.8.0-openjdk libtool $ yum install -y cairo-devel libjpeg-turbo-devel libpng-devel uuid-devel $ yum install -y ffmpeg-devel freerdp-devel pango-devel libssh2-devel libtelnet-devel libvncserver-devel pulseaudio-libs-devel openssl-devel libvorbis-devel libwebp-devel ghostscript @@ -441,7 +447,7 @@ Guacamole éœ€è¦ Tomcat æ¥è¿è¡Œ $ ./configure --with-init-dir=/etc/init.d $ make && make install $ cd .. - $ rm -rf guacamole-server-0.9.14.tar.gz guacamole-server-0.9.14 + $ rm -rf guacamole-server-0.9.14 $ ldconfig **5.3 é…ç½® Tomcat** @@ -468,8 +474,6 @@ Guacamole éœ€è¦ Tomcat æ¥è¿è¡Œ $ export JUMPSERVER_SERVER=http://127.0.0.1:8080 # http://127.0.0.1:8080 指 jumpserver è®¿é—®åœ°å€ $ echo "export JUMPSERVER_SERVER=http://127.0.0.1:8080" >> ~/.bashrc - $ export JUMPSERVER_ENABLE_DRIVE=true - $ echo "export JUMPSERVER_ENABLE_DRIVE=true " >> ~/.bashrc $ export JUMPSERVER_KEY_DIR=/config/guacamole/keys $ echo "export JUMPSERVER_KEY_DIR=/config/guacamole/keys" >> ~/.bashrc $ export GUACAMOLE_HOME=/config/guacamole @@ -493,7 +497,7 @@ Guacamole éœ€è¦ Tomcat æ¥è¿è¡Œ $ yum -y install nginx - $ vim /etc/nginx/nginx.conf + $ vi /etc/nginx/nginx.conf ... 原内容 include /etc/nginx/conf.d/*.conf; @@ -525,7 +529,7 @@ Guacamole éœ€è¦ Tomcat æ¥è¿è¡Œ :: - $ vim /etc/nginx/conf.d/jumpserver.conf + $ vi /etc/nginx/conf.d/jumpserver.conf # æ³¨æ„æ³¨é‡Š nginx.conf 里é¢çš„ server {} 内容 ,CentOS 6 需è¦ä¿®æ”¹æ–‡ä»¶ /etc/nginx/cond.f/default.conf server {