Merge pull request #416 from jumpserver/master

v3.10.8 master to v3.10

compose/docker-compose-celery-xpack.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   celery:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}

compose/docker-compose-celery.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   celery:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}

compose/docker-compose-chen.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   chen:
     image: ${REGISTRY:-docker.io}/jumpserver/chen:${VERSION}

compose/docker-compose-core-xpack.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   core:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}

compose/docker-compose-core.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   core:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}

compose/docker-compose-es.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   es:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16

compose/docker-compose-init-db-xpack.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   core:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}

compose/docker-compose-init-db.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   core:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}

compose/docker-compose-kael.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   kael:
     image: ${REGISTRY:-docker.io}/jumpserver/kael:${VERSION}

compose/docker-compose-koko.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   koko:
     image: ${REGISTRY:-docker.io}/jumpserver/koko:${VERSION}

compose/docker-compose-lb.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   web:
     ports:

compose/docker-compose-lion.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   lion:
     image: ${REGISTRY:-docker.io}/jumpserver/lion:${VERSION}

compose/docker-compose-magnus-xpack.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   magnus:
     ports:

compose/docker-compose-magnus.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   magnus:
     image: ${REGISTRY:-docker.io}/jumpserver/magnus:${VERSION}

compose/docker-compose-mariadb.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mysql:
     image: jumpserver/mariadb:10.6

compose/docker-compose-minio.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   minio:
     image: jumpserver/minio:latest

compose/docker-compose-mysql.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mysql:
     image: jumpserver/mysql:5.7

compose/docker-compose-network.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   net:
     driver: bridge

compose/docker-compose-network_v6.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   net:
     driver: bridge

compose/docker-compose-panda.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   panda:
     image: ${REGISTRY:-docker.io}/jumpserver/panda:${VERSION}

compose/docker-compose-razor.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   razor:
     image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/razor:${VERSION}
@@ -17,10 +15,10 @@ services:
       - ${VOLUME_DIR}/razor/data:/opt/razor/data
       - ${CONFIG_DIR}/nginx/cert:/opt/razor/cert
     healthcheck:
-      test: "ps axu | grep -v 'grep' | grep 'razor'"
+      test: "curl -fsL http://localhost:8084/razor/health/ > /dev/null"
       interval: 10s
       timeout: 5s
       retries: 3
       start_period: 10s
     networks:
-      - net
+      - net

compose/docker-compose-receptor-xpack.yml

@@ -0,0 +1,3 @@
+services:
+  receptor:
+    image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}

compose/docker-compose-receptor.yml

@@ -0,0 +1,20 @@
+services:
+  receptor:
+    image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}
+    container_name: jms_receptor
+    hostname: jms_receptor
+    ulimits:
+      core: 0
+    restart: always
+    tty: true
+    command: start receptor
+    volumes:
+      - ${VOLUME_DIR}/core/data/share:/opt/jumpserver/data/share
+    healthcheck:
+      test: "test -S /opt/jumpserver/data/share/control.sock || exit 1"
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
+    networks:
+      - net

compose/docker-compose-redis.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   redis:
     image: jumpserver/redis:6.2

compose/docker-compose-video-worker.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   video:
     image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/video-worker:${VERSION}

compose/docker-compose-video.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   video:
     image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/video-worker:${VERSION}

compose/docker-compose-web-xpack.yml

@@ -0,0 +1,5 @@
+services:
+  web:
+    environment:
+      USE_XPACK: ${USE_XPACK:-0}
+      RAZOR_ENABLED: ${RAZOR_ENABLED:-1}

compose/docker-compose-web.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   web:
     image: ${REGISTRY:-docker.io}/jumpserver/web:${VERSION}
@@ -11,9 +9,9 @@ services:
     tty: true
     environment:
       HTTP_PORT: ${HTTP_PORT:-80}
+      USE_LB: ${USE_LB:-1}
       USE_IPV6: ${USE_IPV6:-0}
       CLIENT_MAX_BODY_SIZE: ${CLIENT_MAX_BODY_SIZE:-4096m}
-      USE_LB: ${USE_LB:-1}
       CORE_ENABLED: ${CORE_ENABLED:-1}
       KOKO_ENABLED: ${KOKO_ENABLED:-1}
       LION_ENABLED: ${LION_ENABLED:-1}

compose/docker-compose-xrdp.yml

@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   xrdp:
     image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/xrdp:${VERSION}

config-example.txt

@@ -118,7 +118,7 @@ PERIOD_TASK_ENABLED=true
 # SESSION_EXPIRE_AT_BROWSER_CLOSE=true 表示关闭浏览器即 session 过期
 #
 # SESSION_COOKIE_AGE=86400
-SESSION_EXPIRE_AT_BROWSER_CLOSE=true
+SESSION_EXPIRE_AT_BROWSER_CLOSE=false
 
 # 可信任 DOMAINS 定义,
 # 定义可信任的访问 IP, 请根据实际情况修改, 如果是公网 IP 请改成对应的公网 IP,
@@ -136,6 +136,7 @@ DOMAINS=
 # CHEN_ENABLED=0
 # KAEL_ENABLED=0
 # PANDA_ENABLED=0
+# WEB_ENABLED=0
 
 # Lion 开启字体平滑, 优化体验
 #

jmsctl.sh

@@ -45,16 +45,14 @@ function usage() {
   echo
   echo "Installation Commands: "
   echo "  install           $(gettext 'Install JumpServer')"
-  echo "  upgrade [version] $(gettext 'Upgrade JumpServer')"
-  echo "  check_update      $(gettext 'Check for updates JumpServer')"
-  echo "  reconfig          $(gettext 'Reconfiguration JumpServer')"
   echo
   echo "Management Commands: "
-  echo "  start             $(gettext 'Start   JumpServer')"
-  echo "  stop              $(gettext 'Stop    JumpServer')"
-  echo "  restart           $(gettext 'Restart JumpServer')"
-  echo "  status            $(gettext 'Check   JumpServer')"
-  echo "  down              $(gettext 'Offline JumpServer')"
+  echo "  config            $(gettext 'Configuration  Tools')"
+  echo "  start             $(gettext 'Start     JumpServer')"
+  echo "  stop              $(gettext 'Stop      JumpServer')"
+  echo "  restart           $(gettext 'Restart   JumpServer')"
+  echo "  status            $(gettext 'Check     JumpServer')"
+  echo "  down              $(gettext 'Offline   JumpServer')"
   echo "  uninstall         $(gettext 'Uninstall JumpServer')"
   echo
   echo "More Commands: "
@@ -184,7 +182,7 @@ function main() {
 
   if [[ "${action}" == "help" || "${action}" == "h" || "${action}" == "-h" || "${action}" == "--help" ]]; then
     echo ""
-  elif [[ "${action}" == "install" || "${action}" == "reconfig" ]]; then
+  elif [[ "${action}" == "install" || "${action}" == "config" || "${action}" == "reconfig" ]]; then
     echo ""
   else
     pre_check || return 3
@@ -200,6 +198,9 @@ function main() {
   check_update)
     check_update
     ;;
+  config)
+    bash "${SCRIPT_DIR}/config.sh" "$target"
+    ;;
   reconfig)
     ${EXE} down -v
     bash "${SCRIPT_DIR}/1_config_jumpserver.sh"