From feca0bdef705529baaf4da9e322807b3e185a390 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Thu, 11 May 2023 02:11:02 +0800 Subject: [PATCH] fix: change the filename from script to scripts Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- README.md | 10 +++++----- deploy.Dockerfile | 10 +++++----- deploy_k8s/admin_cms/admin_cms.Dockerfile | 4 ++-- deploy_k8s/api/api.Dockerfile | 4 ++-- deploy_k8s/auth/auth.Dockerfile | 4 ++-- deploy_k8s/cache/cache.Dockerfile | 4 ++-- deploy_k8s/cms_api/cms_api.Dockerfile | 4 ++-- deploy_k8s/conversation/conversation.Dockerfile | 4 ++-- deploy_k8s/demo/demo.Dockerfile | 4 ++-- deploy_k8s/friend/friend.Dockerfile | 4 ++-- deploy_k8s/group/group.Dockerfile | 4 ++-- deploy_k8s/msg/msg.Dockerfile | 4 ++-- deploy_k8s/msg_gateway/msg_gateway.Dockerfile | 4 ++-- deploy_k8s/msg_transfer/msg_transfer.Dockerfile | 4 ++-- deploy_k8s/office/office.Dockerfile | 4 ++-- deploy_k8s/organization/organization.Dockerfile | 4 ++-- deploy_k8s/push/push.Dockerfile | 4 ++-- deploy_k8s/sdk_server/sdk_server.Dockerfile | 2 +- deploy_k8s/user/user.Dockerfile | 4 ++-- docker-compose-mongos.yaml | 2 +- docker-compose.yaml | 2 +- docker-compose_cfg/grafana.ini | 2 +- init_docker.sh | 4 ++-- install_im_server.sh | 4 ++-- scripts/batch_start_all.sh | 8 +++----- scripts/docker_start_all.sh | 6 +++--- scripts/start_all.sh | 6 +++--- scripts/stop_all.sh | 2 +- 28 files changed, 60 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index 6803d7f98..d33151de0 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ By deployment of the Open-IM-Server on the customer's server, developers can int 4. Check service ``` - cd script; + cd scripts; ./docker_check_service.sh./check_all.sh ``` @@ -135,18 +135,18 @@ all services build success - multiloginpolicy&&tokenpolicy - Open-IM supports multi-terminal login. Currently, there are three multi-terminal login policies. The PC terminal and the mobile terminal are online at the same time by default. When multiple policies are configured to be true, the first policy with true is used by default, and the token policy is the generated token policy. , The developer can customize the expiration time of the token -### SCRIPT DESCRIPTION +### scripts DESCRIPTION -> Open-IM script provides service compilation, start, and stop scripts. There are four Open-IM script start modules, one is the http+rpc service start module, the second is the websocket service start module, then the msg_transfer module, and the last is the push module +> Open-IM scripts provides service compilation, start, and stop scripts. There are four Open-IM scripts start modules, one is the http+rpc service start module, the second is the websocket service start module, then the msg_transfer module, and the last is the push module - path_info.cfg&&style_info.cfg&&functions.sh - Contains the path information of each module, including the path where the source code is located, the name of the service startup, the shell print font style, and some functions for processing shell strings - build_all_service.sh - Compile the module, compile all the source code of Open-IM into a binary file and put it into the bin directory - start_rpc_api_service.sh&&msg_gateway_start.sh&&msg_transfer_start.sh&&push_start.sh - - Independent script startup module, followed by api and rpc modules, message gateway module, message transfer module, and push module + - Independent scripts startup module, followed by api and rpc modules, message gateway module, message transfer module, and push module - start_all.sh&&stop_all.sh - - Total script, start all services and close all services + - Total scripts, start all services and close all services ## Authentication Clow Chart diff --git a/deploy.Dockerfile b/deploy.Dockerfile index 1738bda80..01923032c 100644 --- a/deploy.Dockerfile +++ b/deploy.Dockerfile @@ -9,7 +9,7 @@ WORKDIR /Open-IM-Server # add all files to the container COPY . . -WORKDIR /Open-IM-Server/script +WORKDIR /Open-IM-Server/scripts RUN chmod +x *.sh RUN /bin/sh -c ./build_all_service.sh @@ -27,13 +27,13 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata -#set directory to map logs,config file,script file. -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +#set directory to map logs,config file,scripts file. +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts","/Open-IM-Server/db/sdk"] #Copy scripts files and binary files to the blank image -COPY --from=build /Open-IM-Server/script /Open-IM-Server/script +COPY --from=build /Open-IM-Server/scripts /Open-IM-Server/scripts COPY --from=build /Open-IM-Server/bin /Open-IM-Server/bin -WORKDIR /Open-IM-Server/script +WORKDIR /Open-IM-Server/scripts CMD ["./docker_start_all.sh"] diff --git a/deploy_k8s/admin_cms/admin_cms.Dockerfile b/deploy_k8s/admin_cms/admin_cms.Dockerfile index a7b33da70..0bff5d22b 100644 --- a/deploy_k8s/admin_cms/admin_cms.Dockerfile +++ b/deploy_k8s/admin_cms/admin_cms.Dockerfile @@ -10,10 +10,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_admin_cms $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config", "/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config", "/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/api/api.Dockerfile b/deploy_k8s/api/api.Dockerfile index 644621d5f..f177e1319 100644 --- a/deploy_k8s/api/api.Dockerfile +++ b/deploy_k8s/api/api.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_api $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/auth/auth.Dockerfile b/deploy_k8s/auth/auth.Dockerfile index 15eafd782..a2fd5be1a 100644 --- a/deploy_k8s/auth/auth.Dockerfile +++ b/deploy_k8s/auth/auth.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_auth $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/cache/cache.Dockerfile b/deploy_k8s/cache/cache.Dockerfile index 13c5278bd..cf68c5617 100644 --- a/deploy_k8s/cache/cache.Dockerfile +++ b/deploy_k8s/cache/cache.Dockerfile @@ -10,10 +10,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_cache $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR CMD ./main \ No newline at end of file diff --git a/deploy_k8s/cms_api/cms_api.Dockerfile b/deploy_k8s/cms_api/cms_api.Dockerfile index 78eda6ecf..a6fe6e41b 100644 --- a/deploy_k8s/cms_api/cms_api.Dockerfile +++ b/deploy_k8s/cms_api/cms_api.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_cms_api $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR CMD ./main \ No newline at end of file diff --git a/deploy_k8s/conversation/conversation.Dockerfile b/deploy_k8s/conversation/conversation.Dockerfile index bea8d4b00..1cb5d1801 100644 --- a/deploy_k8s/conversation/conversation.Dockerfile +++ b/deploy_k8s/conversation/conversation.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_conversation $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR CMD ./main \ No newline at end of file diff --git a/deploy_k8s/demo/demo.Dockerfile b/deploy_k8s/demo/demo.Dockerfile index 8b829dde0..a0b0ebc23 100644 --- a/deploy_k8s/demo/demo.Dockerfile +++ b/deploy_k8s/demo/demo.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_demo $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/friend/friend.Dockerfile b/deploy_k8s/friend/friend.Dockerfile index 54f430e01..0bd210c0c 100644 --- a/deploy_k8s/friend/friend.Dockerfile +++ b/deploy_k8s/friend/friend.Dockerfile @@ -10,10 +10,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_friend $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR CMD ./main \ No newline at end of file diff --git a/deploy_k8s/group/group.Dockerfile b/deploy_k8s/group/group.Dockerfile index 9baa7b5e9..50471c36b 100644 --- a/deploy_k8s/group/group.Dockerfile +++ b/deploy_k8s/group/group.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_group $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/msg/msg.Dockerfile b/deploy_k8s/msg/msg.Dockerfile index 54a54f9bf..1579f563f 100644 --- a/deploy_k8s/msg/msg.Dockerfile +++ b/deploy_k8s/msg/msg.Dockerfile @@ -10,10 +10,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_msg $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile index 8954af854..2f122cb13 100644 --- a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile +++ b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_msg_gateway $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile index 9d103ce07..1fe599962 100644 --- a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile +++ b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_msg_transfer $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/office/office.Dockerfile b/deploy_k8s/office/office.Dockerfile index 8144deaa1..865e90d9d 100644 --- a/deploy_k8s/office/office.Dockerfile +++ b/deploy_k8s/office/office.Dockerfile @@ -10,10 +10,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_office $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/organization/organization.Dockerfile b/deploy_k8s/organization/organization.Dockerfile index 9a824f1fe..8eb52233f 100644 --- a/deploy_k8s/organization/organization.Dockerfile +++ b/deploy_k8s/organization/organization.Dockerfile @@ -10,10 +10,10 @@ ADD ./open_im_organization $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/push/push.Dockerfile b/deploy_k8s/push/push.Dockerfile index 92409d225..424e5f332 100644 --- a/deploy_k8s/push/push.Dockerfile +++ b/deploy_k8s/push/push.Dockerfile @@ -10,10 +10,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_push $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/deploy_k8s/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index 9a6eaf8fe..e932c0d22 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -12,7 +12,7 @@ ADD ./open_im_sdk_server $WORKDIR/main RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ chmod +x $WORKDIR/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts","/Open-IM-Server/db/sdk"] WORKDIR $CMDDIR CMD ./main \ No newline at end of file diff --git a/deploy_k8s/user/user.Dockerfile b/deploy_k8s/user/user.Dockerfile index 813757d85..d8466a01f 100644 --- a/deploy_k8s/user/user.Dockerfile +++ b/deploy_k8s/user/user.Dockerfile @@ -9,10 +9,10 @@ ENV CONFIG_NAME $WORKDIR/config/config.yaml ADD ./open_im_user $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/scripts && \ chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/scripts"] WORKDIR $CMDDIR diff --git a/docker-compose-mongos.yaml b/docker-compose-mongos.yaml index e9710f11c..ebe928c7d 100644 --- a/docker-compose-mongos.yaml +++ b/docker-compose-mongos.yaml @@ -122,7 +122,7 @@ services: - ./logs:/Open-IM-Server/logs - ./config/config.yaml:/Open-IM-Server/config/config.yaml - ./db/sdk:/Open-IM-Server/db/sdk - - ./script:/Open-IM-Server/script + - ./scripts:/Open-IM-Server/scripts restart: always depends_on: - kafka diff --git a/docker-compose.yaml b/docker-compose.yaml index 93717185b..a610c1390 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -122,7 +122,7 @@ services: - ./config/config.yaml:/Open-IM-Server/config/config.yaml - ./config/usualConfig.yaml:/Open-IM-Server/config/usualConfig.yaml - ${DATA_DIR}/db/sdk:/Open-IM-Server/db/sdk - - ./script:/Open-IM-Server/script + - ./scripts:/Open-IM-Server/scripts restart: always depends_on: - kafka diff --git a/docker-compose_cfg/grafana.ini b/docker-compose_cfg/grafana.ini index 180de10af..b9380d7f1 100644 --- a/docker-compose_cfg/grafana.ini +++ b/docker-compose_cfg/grafana.ini @@ -306,7 +306,7 @@ content_security_policy = false # Set Content Security Policy template used when adding the Content-Security-Policy header to your requests. # $NONCE in the template includes a random nonce. # $ROOT_PATH is server.root_url without the protocol. -content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';""" +content_security_policy_template = """scripts-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';""" # Controls if old angular plugins are supported or not. This will be disabled by default in future release angular_support_enabled = true diff --git a/init_docker.sh b/init_docker.sh index aa188d65f..edc1df58d 100644 --- a/init_docker.sh +++ b/init_docker.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash -cd script ; +cd scripts ; chmod +x *.sh ; ./env_check.sh; cd .. ; docker-compose up -d; -cd script ; +cd scripts ; ./docker_check_service.sh diff --git a/install_im_server.sh b/install_im_server.sh index ea641d0f8..edf4b8331 100644 --- a/install_im_server.sh +++ b/install_im_server.sh @@ -9,11 +9,11 @@ if [ $MINIO_ENDPOINT == "http://127.0.0.1:10005" ]; then fi -cd script ; +cd scripts ; chmod +x *.sh ; ./init_pwd.sh ./env_check.sh; cd .. ; docker-compose up -d; -cd script ; +cd scripts ; ./docker_check_service.sh diff --git a/scripts/batch_start_all.sh b/scripts/batch_start_all.sh index c2d78c509..e7a8bf884 100644 --- a/scripts/batch_start_all.sh +++ b/scripts/batch_start_all.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -#fixme This script is the total startup script -#fixme The full name of the shell script that needs to be started is placed in the need_to_start_server_shell array +#fixme This scripts is the total startup scripts +#fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array -#fixme Put the shell script name here +#fixme Put the shell scripts name here need_to_start_server_shell=( start_rpc_service.sh msg_gateway_start.sh @@ -57,5 +57,3 @@ if [ $success_num == ${#need_to_start_server_shell[*]} ] then echo -e ${YELLOW_PREFIX}"all services build success"${COLOR_SUFFIX} fi - - diff --git a/scripts/docker_start_all.sh b/scripts/docker_start_all.sh index 16283cf22..902066a70 100644 --- a/scripts/docker_start_all.sh +++ b/scripts/docker_start_all.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -#fixme This script is the total startup script -#fixme The full name of the shell script that needs to be started is placed in the need_to_start_server_shell array +#fixme This scripts is the total startup scripts +#fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array -#fixme Put the shell script name here +#fixme Put the shell scripts name here need_to_start_server_shell=( start_rpc_service.sh msg_gateway_start.sh diff --git a/scripts/start_all.sh b/scripts/start_all.sh index 4a5f7d65e..e10c027ab 100644 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -#fixme This script is the total startup script -#fixme The full name of the shell script that needs to be started is placed in the need_to_start_server_shell array +#fixme This scripts is the total startup scripts +#fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array -#fixme Put the shell script name here +#fixme Put the shell scripts name here need_to_start_server_shell=( start_rpc_service.sh push_start.sh diff --git a/scripts/stop_all.sh b/scripts/stop_all.sh index 2e1e119c1..35ccd68e6 100644 --- a/scripts/stop_all.sh +++ b/scripts/stop_all.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#fixme This script is to stop the service +#fixme This scripts is to stop the service source ./style_info.cfg source ./path_info.cfg