diff --git a/docs/setup_by_ubuntu.rst b/docs/setup_by_ubuntu.rst index c24e0d12805d087d10697eb19a703584dca81ec0..7581e8ff95ff06fc88c9d34e3136172497a081f7 100644 --- a/docs/setup_by_ubuntu.rst +++ b/docs/setup_by_ubuntu.rst @@ -440,12 +440,12 @@ Luna 已改为纯å‰ç«¯,éœ€è¦ Nginx æ¥è¿è¡Œè®¿é—® $ ./configure --with-init-dir=/etc/init.d $ make && make install $ cd .. - $ rm -rf guacamole-server-0.9.14 \ + $ rm -rf guacamole-server-0.9.14 $ ldconfig $ mkdir -p /config/guacamole /config/guacamole/lib /config/guacamole/extensions # 创建 guacamole 目录 - $ cp /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/ - $ cp /opt/docker-guacamole/root/app/guacamole/guacamole.properties /config/guacamole/ # guacamole é…置文件 + $ ln -sf /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar + $ ln -sf /opt/docker-guacamole/root/app/guacamole/guacamole.properties /config/guacamole/guacamole.properties # guacamole é…置文件 $ cd /config $ wget https://github.com/ibuler/ssh-forward/releases/download/v0.0.5/linux-amd64.tar.gz @@ -462,7 +462,7 @@ Luna 已改为纯å‰ç«¯,éœ€è¦ Nginx æ¥è¿è¡Œè®¿é—® $ rm -rf apache-tomcat-8.5.35.tar.gz $ mv apache-tomcat-8.5.35 tomcat8 $ rm -rf /config/tomcat8/webapps/* - $ cp /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war # guacamole client + $ 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 diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index f690843599474285b82c266e4caff8fafe12d019..75bb094f0e15444729cc80130f63681d75b891ad 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -467,8 +467,8 @@ Guacamole éœ€è¦ Tomcat æ¥è¿è¡Œ .. code-block:: shell $ mkdir -p /config/guacamole /config/guacamole/lib /config/guacamole/extensions # 创建 guacamole 目录 - $ cp /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar - $ cp /opt/docker-guacamole/root/app/guacamole/guacamole.properties /config/guacamole/ # guacamole é…置文件 + $ ln -sf /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar + $ ln -sf /opt/docker-guacamole/root/app/guacamole/guacamole.properties /config/guacamole/guacamole.properties # guacamole é…置文件 $ cd /config $ wget http://mirror.bit.edu.cn/apache/tomcat/tomcat-8/v8.5.35/bin/apache-tomcat-8.5.35.tar.gz @@ -476,7 +476,7 @@ Guacamole éœ€è¦ Tomcat æ¥è¿è¡Œ $ rm -rf apache-tomcat-8.5.35.tar.gz $ mv apache-tomcat-8.5.35 tomcat8 $ rm -rf /config/tomcat8/webapps/* - $ cp /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war # guacamole client + $ 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 diff --git a/docs/upgrade.rst b/docs/upgrade.rst index 2ad017bcb00cc520b57c89caff12d0b776894e88..21b737e1e7ad677699e418d30dcd719a0039cec7 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -1,7 +1,7 @@ æ›´æ–°å‡çº§ ------------- -1.0.x å‡çº§åˆ° 1.4.4 +ä»»æ„版本å‡çº§åˆ° 1.4.4 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 请先检查自己å„组件的当å‰ç‰ˆæœ¬ @@ -544,7 +544,7 @@ $ git pull $ /etc/init.d/guacd stop $ sh /config/tomcat8/bin/shutdown.sh - $ cp -r guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar + $ ln -sf guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar $ cd /config $ wget https://github.com/ibuler/ssh-forward/releases/download/v0.0.5/linux-amd64.tar.gz @@ -626,7 +626,7 @@ $ git pull $ /etc/init.d/guacd stop $ sh /config/tomcat8/bin/shutdown.sh - $ cp -r guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar + $ ln -sf guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar $ /etc/init.d/guacd start $ sh /config/tomcat8/bin/startup.sh