Merge pull request #2324 from wojiushixiaobai/docs

[Update]更新文档

docs/faq.rst

@@ -217,7 +217,7 @@ FAQ
     $ systemctl stop firewalld.service  # 临时关闭防火墙,重启后失效
 
     # Centos 7 如需永久关闭,还需执行下面步骤
-    $ sed -i "s/enforcing/disabled/g" 'grep enforcing -rl /etc/selinux/config'  # 禁用 selinux
+    $ sed -i "s/enforcing/disabled/g" /etc/selinux/config  # 禁用 selinux
     $ systemctl disable firewalld.service  # 禁用防火墙
 
     # Centos 7 在不关闭 selinux 和 防火墙 的情况下使用 Jumpserver

docs/setup_by_centos7.rst

@@ -38,7 +38,7 @@ CentOS 7 安装文档
     $ firewall-cmd --reload  # 重新载入规则
 
     $ setenforce 0
-    $ sed -i "s/enforcing/disabled/g" `grep enforcing -rl /etc/selinux/config`
+    $ sed -i "s/enforcing/disabled/g" /etc/selinux/config
 
     # 修改字符集,否则可能报 input/output error的问题,因为日志里打印了中文
     $ localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8

docs/setup_by_ubuntu.rst

@@ -463,8 +463,8 @@ Luna 已改为纯前端,需要 Nginx 来运行访问
     $ mv apache-tomcat-8.5.35 tomcat8
     $ rm -rf /config/tomcat8/webapps/*
     $ ln -sf /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war  # guacamole client
-    $ sed -i 's/Connector port="8080"/Connector port="8081"/g' `grep 'Connector port="8080"' -rl /config/tomcat8/conf/server.xml`  # 修改默认端口为 8081
-    $ sed -i 's/FINE/WARNING/g' `grep 'FINE' -rl /config/tomcat8/conf/logging.properties`  # 修改 log 等级为 WARNING
+    $ sed -i 's/Connector port="8080"/Connector port="8081"/g' /config/tomcat8/conf/server.xml  # 修改默认端口为 8081
+    $ sed -i 's/FINE/WARNING/g' /config/tomcat8/conf/logging.properties  # 修改 log 等级为 WARNING
 
 **5.4 配置环境变量**
 

docs/step_by_step.rst

@@ -29,7 +29,7 @@
     $ firewall-cmd --reload  # 重新载入规则
 
     $ setenforce 0
-    $ sed -i "s/enforcing/disabled/g" `grep enforcing -rl /etc/selinux/config`
+    $ sed -i "s/enforcing/disabled/g" /etc/selinux/config
 
     # 修改字符集,否则可能报 input/output error的问题,因为日志里打印了中文
     $ localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8
@@ -479,8 +479,8 @@ Guacamole 需要 Tomcat 来运行
     $ mv apache-tomcat-8.5.35 tomcat8
     $ rm -rf /config/tomcat8/webapps/*
     $ ln -sf /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war  # guacamole client
-    $ sed -i 's/Connector port="8080"/Connector port="8081"/g' `grep 'Connector port="8080"' -rl /config/tomcat8/conf/server.xml`  # 修改默认端口为 8081
-    $ sed -i 's/FINE/WARNING/g' `grep 'FINE' -rl /config/tomcat8/conf/logging.properties`  # 修改 log 等级为 WARNING
+    $ sed -i 's/Connector port="8080"/Connector port="8081"/g' /config/tomcat8/conf/server.xml  # 修改默认端口为 8081
+    $ sed -i 's/FINE/WARNING/g' /config/tomcat8/conf/logging.properties  # 修改 log 等级为 WARNING
 
     $ cd /config
     $ wget https://github.com/ibuler/ssh-forward/releases/download/v0.0.5/linux-amd64.tar.gz