From 922c53b3da6a6e4f1c1564a1f77227fb05b50d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A2=E4=B9=90=E9=A9=AC?= <38058090+SkywalkerSpace@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:43:45 +0800 Subject: [PATCH] env SEAFILE_MYSQL_DB_CCNET_DB_NAME (#7036) --- scripts/seaf-fsck.sh | 30 ++++++++++++++++++++++++++++++ scripts/seaf-fuse.sh | 30 ++++++++++++++++++++++++++++++ scripts/seaf-gc.sh | 30 ++++++++++++++++++++++++++++++ scripts/seafile-monitor.sh | 3 +++ scripts/seafile.sh | 3 +++ scripts/seahub.sh | 3 +++ 6 files changed, 99 insertions(+) diff --git a/scripts/seaf-fsck.sh b/scripts/seaf-fsck.sh index 6c08be517b..3f0666c4d2 100755 --- a/scripts/seaf-fsck.sh +++ b/scripts/seaf-fsck.sh @@ -12,6 +12,7 @@ seaf_fsck=${INSTALLPATH}/seafile/bin/seaf-fsck export PATH=${INSTALLPATH}/seafile/bin:$PATH export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} +export SEAFILE_CENTRAL_CONF_DIR=${default_conf_dir} script_name=$0 function usage () { @@ -20,6 +21,34 @@ function usage () { echo "" } +function set_env_config () { + if [ -z "${JWT_PRIVATE_KEY}" ]; then + if [ ! -e "${SEAFILE_CENTRAL_CONF_DIR}/.env" ]; then + echo "Error: .env file not found." + echo "Please follow the upgrade manual to set the .env file." + echo "" + exit -1; + fi + + # load the .env file + source "${SEAFILE_CENTRAL_CONF_DIR}/.env" + + if [ -z "${JWT_PRIVATE_KEY}" ]; then + echo "Error: JWT_PRIVATE_KEY not found in .env file." + echo "Please follow the upgrade manual to set the .env file." + echo "" + exit -1; + fi + export JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY} + export SEAFILE_MYSQL_DB_CCNET_DB_NAME=${SEAFILE_MYSQL_DB_CCNET_DB_NAME} + export SEAFILE_MYSQL_DB_SEAFILE_DB_NAME=${SEAFILE_MYSQL_DB_SEAFILE_DB_NAME} + export SEAFILE_MYSQL_DB_SEAHUB_DB_NAME=${SEAFILE_MYSQL_DB_SEAHUB_DB_NAME} + export SEAFILE_SERVER_PROTOCOL=${SEAFILE_SERVER_PROTOCOL} + export SEAFILE_SERVER_HOSTNAME=${SEAFILE_SERVER_HOSTNAME} + export SITE_ROOT=${SITE_ROOT} + fi +} + function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then echo "Error: there is no seafile server data directory." @@ -31,6 +60,7 @@ function validate_seafile_data_dir () { function run_seaf_fsck () { validate_seafile_data_dir; + set_env_config; echo "Starting seaf-fsck, please wait ..." echo diff --git a/scripts/seaf-fuse.sh b/scripts/seaf-fuse.sh index 407207559d..eebc88e401 100755 --- a/scripts/seaf-fuse.sh +++ b/scripts/seaf-fuse.sh @@ -12,6 +12,7 @@ seaf_fuse=${INSTALLPATH}/seafile/bin/seaf-fuse export PATH=${INSTALLPATH}/seafile/bin:$PATH export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} +export SEAFILE_CENTRAL_CONF_DIR=${default_conf_dir} script_name=$0 function usage () { @@ -36,6 +37,34 @@ if [[ $1 == "stop" && $# != 1 ]]; then exit 1 fi +function set_env_config () { + if [ -z "${JWT_PRIVATE_KEY}" ]; then + if [ ! -e "${SEAFILE_CENTRAL_CONF_DIR}/.env" ]; then + echo "Error: .env file not found." + echo "Please follow the upgrade manual to set the .env file." + echo "" + exit -1; + fi + + # load the .env file + source "${SEAFILE_CENTRAL_CONF_DIR}/.env" + + if [ -z "${JWT_PRIVATE_KEY}" ]; then + echo "Error: JWT_PRIVATE_KEY not found in .env file." + echo "Please follow the upgrade manual to set the .env file." + echo "" + exit -1; + fi + export JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY} + export SEAFILE_MYSQL_DB_CCNET_DB_NAME=${SEAFILE_MYSQL_DB_CCNET_DB_NAME} + export SEAFILE_MYSQL_DB_SEAFILE_DB_NAME=${SEAFILE_MYSQL_DB_SEAFILE_DB_NAME} + export SEAFILE_MYSQL_DB_SEAHUB_DB_NAME=${SEAFILE_MYSQL_DB_SEAHUB_DB_NAME} + export SEAFILE_SERVER_PROTOCOL=${SEAFILE_SERVER_PROTOCOL} + export SEAFILE_SERVER_HOSTNAME=${SEAFILE_SERVER_HOSTNAME} + export SITE_ROOT=${SITE_ROOT} + fi +} + function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then echo "Error: there is no seafile server data directory." @@ -65,6 +94,7 @@ function start_seaf_fuse () { validate_already_running; warning_if_seafile_not_running; validate_seafile_data_dir; + set_env_config; echo "Starting seaf-fuse, please wait ..." diff --git a/scripts/seaf-gc.sh b/scripts/seaf-gc.sh index 9451a80d97..06fb97d998 100755 --- a/scripts/seaf-gc.sh +++ b/scripts/seaf-gc.sh @@ -16,6 +16,7 @@ IS_PRO_SEAFEVENTS=`awk '/is_pro/{getline;print $2;exit}' ${pro_pylibs_dir}/seafe export PATH=${INSTALLPATH}/seafile/bin:$PATH export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} +export SEAFILE_CENTRAL_CONF_DIR=${default_conf_dir} script_name=$0 function usage () { @@ -53,6 +54,34 @@ function check_python_executable() { fi } +function set_env_config () { + if [ -z "${JWT_PRIVATE_KEY}" ]; then + if [ ! -e "${SEAFILE_CENTRAL_CONF_DIR}/.env" ]; then + echo "Error: .env file not found." + echo "Please follow the upgrade manual to set the .env file." + echo "" + exit -1; + fi + + # load the .env file + source "${SEAFILE_CENTRAL_CONF_DIR}/.env" + + if [ -z "${JWT_PRIVATE_KEY}" ]; then + echo "Error: JWT_PRIVATE_KEY not found in .env file." + echo "Please follow the upgrade manual to set the .env file." + echo "" + exit -1; + fi + export JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY} + export SEAFILE_MYSQL_DB_CCNET_DB_NAME=${SEAFILE_MYSQL_DB_CCNET_DB_NAME} + export SEAFILE_MYSQL_DB_SEAFILE_DB_NAME=${SEAFILE_MYSQL_DB_SEAFILE_DB_NAME} + export SEAFILE_MYSQL_DB_SEAHUB_DB_NAME=${SEAFILE_MYSQL_DB_SEAHUB_DB_NAME} + export SEAFILE_SERVER_PROTOCOL=${SEAFILE_SERVER_PROTOCOL} + export SEAFILE_SERVER_HOSTNAME=${SEAFILE_SERVER_HOSTNAME} + export SITE_ROOT=${SITE_ROOT} + fi +} + function validate_seafile_data_dir () { if [[ ! -d ${default_seafile_data_dir} ]]; then echo "Error: there is no seafile server data directory." @@ -102,6 +131,7 @@ function run_seaf_gc () { fi validate_seafile_data_dir; + set_env_config; echo "Starting seafserv-gc, please wait ..." diff --git a/scripts/seafile-monitor.sh b/scripts/seafile-monitor.sh index 5ec357c5ad..eb74cbdae9 100755 --- a/scripts/seafile-monitor.sh +++ b/scripts/seafile-monitor.sh @@ -82,6 +82,9 @@ function set_env_config () { exit -1; fi export JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY} + export SEAFILE_MYSQL_DB_CCNET_DB_NAME=${SEAFILE_MYSQL_DB_CCNET_DB_NAME} + export SEAFILE_MYSQL_DB_SEAFILE_DB_NAME=${SEAFILE_MYSQL_DB_SEAFILE_DB_NAME} + export SEAFILE_MYSQL_DB_SEAHUB_DB_NAME=${SEAFILE_MYSQL_DB_SEAHUB_DB_NAME} export SEAFILE_SERVER_PROTOCOL=${SEAFILE_SERVER_PROTOCOL} export SEAFILE_SERVER_HOSTNAME=${SEAFILE_SERVER_HOSTNAME} export SITE_ROOT=${SITE_ROOT} diff --git a/scripts/seafile.sh b/scripts/seafile.sh index eaa5bde0d0..21d9715ca1 100755 --- a/scripts/seafile.sh +++ b/scripts/seafile.sh @@ -79,6 +79,9 @@ function set_env_config () { exit -1; fi export JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY} + export SEAFILE_MYSQL_DB_CCNET_DB_NAME=${SEAFILE_MYSQL_DB_CCNET_DB_NAME} + export SEAFILE_MYSQL_DB_SEAFILE_DB_NAME=${SEAFILE_MYSQL_DB_SEAFILE_DB_NAME} + export SEAFILE_MYSQL_DB_SEAHUB_DB_NAME=${SEAFILE_MYSQL_DB_SEAHUB_DB_NAME} export SEAFILE_SERVER_PROTOCOL=${SEAFILE_SERVER_PROTOCOL} export SEAFILE_SERVER_HOSTNAME=${SEAFILE_SERVER_HOSTNAME} export SITE_ROOT=${SITE_ROOT} diff --git a/scripts/seahub.sh b/scripts/seahub.sh index 88843ca688..902063b066 100755 --- a/scripts/seahub.sh +++ b/scripts/seahub.sh @@ -205,6 +205,9 @@ function set_env_config () { exit -1; fi export JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY} + export SEAFILE_MYSQL_DB_CCNET_DB_NAME=${SEAFILE_MYSQL_DB_CCNET_DB_NAME} + export SEAFILE_MYSQL_DB_SEAFILE_DB_NAME=${SEAFILE_MYSQL_DB_SEAFILE_DB_NAME} + export SEAFILE_MYSQL_DB_SEAHUB_DB_NAME=${SEAFILE_MYSQL_DB_SEAHUB_DB_NAME} export SEAFILE_SERVER_PROTOCOL=${SEAFILE_SERVER_PROTOCOL} export SEAFILE_SERVER_HOSTNAME=${SEAFILE_SERVER_HOSTNAME} export SITE_ROOT=${SITE_ROOT}