haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-04-28 03:20:10 +00:00
Code Issues Releases Wiki Activity

rm CCNET_CONF_DIR

Browse Source
This commit is contained in:
skywalker 2025-03-28 11:16:38 +08:00
parent 537763b119
commit 470c18f6f7
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/seaserv/__init__.py
View File

@ -32,10 +32,10 @@ from .service import create_org, get_orgs_by_user, get_org_by_url_prefix, \
from .service import get_related_users_by_repo, get_related_users_by_org_repo
from .service import post_empty_file, del_file
from .service import CCNET_CONF_PATH, \
from .service import \
MAX_UPLOAD_FILE_SIZE, MAX_DOWNLOAD_DIR_SIZE, FILE_SERVER_ROOT, \
CALC_SHARE_USAGE, FILE_SERVER_PORT, \
SEAFILE_CENTRAL_CONF_DIR, LDAP_HOST, USE_GO_FILESERVER
SEAFILE_CENTRAL_CONF_DIR, USE_GO_FILESERVER
from .service import send_message

10
python/seaserv/service.py
View File

@ -12,7 +12,7 @@ from pysearpc import SearpcError
_DEBUG = 'SEAFILE_DEBUG' in os.environ
ENVIRONMENT_VARIABLES = ('CCNET_CONF_DIR', 'SEAFILE_CONF_DIR')
ENVIRONMENT_VARIABLES = ('SEAFILE_CONF_DIR', )
# Used to fix bug in some rpc calls, will be removed in near future.
MAX_INT = 2147483647
@ -27,7 +27,6 @@ def _load_path_from_env(key, check=True):
print("Loading %s from %s" % (key, v))
return os.path.normpath(os.path.expanduser(v))
CCNET_CONF_PATH = _load_path_from_env('CCNET_CONF_DIR', check=False)
SEAFILE_CONF_DIR = _load_path_from_env('SEAFILE_CONF_DIR')
SEAFILE_CENTRAL_CONF_DIR = _load_path_from_env('SEAFILE_CENTRAL_CONF_DIR', check=False)
SEAFILE_RPC_PIPE_PATH = _load_path_from_env ("SEAFILE_RPC_PIPE_PATH", check=False)
@ -40,13 +39,6 @@ ccnet_threaded_rpc = seafserv_threaded_rpc
# load ccnet server addr and port from ccnet.conf.
# 'addr:port' is used when downloading a repo
config = configparser.ConfigParser()
config.read(os.path.join(SEAFILE_CENTRAL_CONF_DIR if SEAFILE_CENTRAL_CONF_DIR else CCNET_CONF_PATH,
'ccnet.conf'))
if config.has_option('LDAP', 'HOST'):
LDAP_HOST = config.get('LDAP', 'HOST')
else:
LDAP_HOST = None
config.read(os.path.join(SEAFILE_CENTRAL_CONF_DIR if SEAFILE_CENTRAL_CONF_DIR else SEAFILE_CONF_DIR,
'seafile.conf'))