Merge pull request #163 from jumpserver/dev

v3.10.4

Dockerfile

@@ -1,5 +1,5 @@
 ARG VERSION
-FROM registry.fit2cloud.com/jumpserver/web-static:v1.0.5 as static
+FROM registry.fit2cloud.com/jumpserver/web-static:v1.0.7 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

default.conf

@@ -10,6 +10,12 @@ server {
         return 200 "User-agent: *\nDisallow: /\n";
     }
 
+    location /web/health/ {
+        access_log off;
+        add_header Content-Type 'application/json';
+        return 200 '{"status": "ok"}';
+    }
+
     location /player/ {
         try_files $uri / /index.html;
         alias /opt/player/;

http_server.conf

@@ -1,23 +1,23 @@
 server {
-  listen 80;
-  # listen [::]:80;
-  # server_name demo.jumpserver.org;  # 取消注释并自行修改成你自己的域名
+    listen 80;
+    # listen [::]:80;
+    # server_name demo.jumpserver.org;  # 取消注释并自行修改成你自己的域名
 
-  client_max_body_size 5000m;
+    client_max_body_size 5000m;
 
-  location / {
-    proxy_pass http://localhost:51980;
-    proxy_buffering off;
-    proxy_request_buffering off;
-    proxy_http_version 1.1;
-    proxy_set_header Host $host;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $http_connection;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_ignore_client_abort on;
-    proxy_connect_timeout 600;
-    proxy_send_timeout 600;
-    proxy_read_timeout 600;
-    send_timeout 6000;
+    location / {
+        proxy_pass http://localhost:51980;
+        proxy_buffering off;
+        proxy_request_buffering off;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $http_connection;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_ignore_client_abort on;
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 6000;
   }
 }

init.sh

@@ -16,9 +16,9 @@ function config_nginx() {
   fi
 
   if [ "${USE_IPV6}" == "1" ]; then
-    sed -i "s@# listen [::]:80;@listen [::]:80;@g" "${config_file}"
+    sed -i "s@# listen \[::\]:80;@listen \[::\]:80;@g" "${config_file}"
     if [ -f "/etc/nginx/conf.d/default.conf" ]; then
-      sed -i "s@# listen [::]:51980;@listen [::]:51980;@g" /etc/nginx/conf.d/default.conf
+      sed -i "s@# listen \[::\]:51980;@listen \[::\]:51980;@g" /etc/nginx/conf.d/default.conf
     fi
   fi
 
@@ -88,7 +88,7 @@ function config_https() {
   sed -i "s@server web:.*;@server localhost:51980;@g" "${config_file}"
 
   if [ "${USE_IPV6}" == "1" ]; then
-    sed -i "s@listen 443@listen [::]:443@g" "${config_file}"
+    sed -i "s@# listen \[::\]:443@listen \[::\]:443@g" "${config_file}"
   fi
 
   if [ "${HTTPS_PORT}" != "443" ]; then