Merge pull request #178 from jumpserver/dev

v3.10.8

Dockerfile

@@ -1,5 +1,5 @@
 ARG VERSION
-FROM registry.fit2cloud.com/jumpserver/web-static:v1.0.7 as static
+FROM registry.fit2cloud.com/jumpserver/web-static:v1.1.3 as static
 FROM registry.fit2cloud.com/jumpserver/lina:${VERSION} as lina
 FROM registry.fit2cloud.com/jumpserver/luna:${VERSION} as luna
 FROM registry.fit2cloud.com/jumpserver/applets:${VERSION} as applets

includes/razor.conf.disabled

@@ -0,0 +1,15 @@
+location /razor/ {
+    proxy_pass http://razor:8084;
+    proxy_buffering off;
+    proxy_http_version 1.1;
+    proxy_request_buffering off;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_ignore_client_abort on;
+    proxy_connect_timeout 600;
+    proxy_send_timeout 600;
+    proxy_read_timeout 600;
+    send_timeout 6000;
+}

init.sh

@@ -131,6 +131,12 @@ function config_components() {
   if [ "${KAEL_ENABLED}" == "0" ]; then
     mv /etc/nginx/includes/kael.conf /etc/nginx/includes/kael.conf.disabled
   fi
+
+  if [ "${USE_XPACK}" == "1" ]; then
+    if [ "${RAZOR_ENABLED}" != "0" ]; then
+      mv /etc/nginx/includes/razor.conf.disabled /etc/nginx/includes/razor.conf
+    fi
+  fi
 }
 
 function main() {