Add ccnet db name env

haiwen · Nov 5, 2024 · 0edea22 · 0edea22
1 parent 69b7940
commit 0edea22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/ci/run.py b/ci/run.py
@@ -64,6 +64,8 @@ def _env_add(*a, **kw):
 
     _env_add('JWT_PRIVATE_KEY', '@%ukmcl$k=9u-grs4azdljk(sn0kd!=mzc17xd7x8#!u$1x@kl')
 
+    _env_add('SEAFILE_MYSQL_DB_CCNET_DB_NAME', 'ccnet')
+
     # Prepend the seafile-server/python to PYTHONPATH so we don't need to "make
     # install" each time after editing python files.
     _env_add('PYTHONPATH', join(SeafileServer().projectdir, 'python'))

diff --git a/ci/serverctl.py b/ci/serverctl.py
@@ -98,7 +98,6 @@ def add_seafile_db_conf(self):
 user = seafile
 password = seafile
 db_name = seafile
-ccnet_db_name = ccnet
 connection_charset = utf8
 '''
         with open(seafile_conf, 'a+') as fp:
@@ -234,6 +233,7 @@ def get_seaserv_envs(self):
             'SEAFILE_CENTRAL_CONF_DIR': self.central_conf_dir,
             'CCNET_CONF_DIR': self.ccnet_conf_dir,
             'SEAFILE_CONF_DIR': self.seafile_conf_dir,
+            'SEAFILE_MYSQL_DB_CCNET_DB_NAME': 'ccnet',
         })
         return envs
 

diff --git a/common/seaf-utils.c b/common/seaf-utils.c
@@ -99,7 +99,7 @@ load_db_option_from_env (DBOption *option)
     env_user = g_getenv("SEAFILE_MYSQL_DB_USER");
     env_passwd = g_getenv("SEAFILE_MYSQL_DB_PASSWORD");
     env_host = g_getenv("SEAFILE_MYSQL_DB_HOST");
-    env_ccnet_db = g_getenv("SEAFILE_MYSQL_DB_HOST");
+    env_ccnet_db = g_getenv("SEAFILE_MYSQL_DB_CCNET_DB_NAME");
     env_seafile_db = g_getenv("SEAFILE_MYSQL_DB_SEAFILE_DB_NAME");
 
     if (env_user) {