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

Merge pull request #21 from haiwen/ldap

Browse Source 
[python] Read LDAP config from ccnet.conf
This commit is contained in:
Jiaqiang Xu
2017-02-10 13:51:29 +08:00
committed by GitHub
parent 13c6936502 60a5ac7371
commit b8670b200b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/seaserv/__init__.py
View File

@@ -36,7 +36,7 @@ from service import post_empty_file, del_file
from service import CCNET_CONF_PATH, CCNET_SERVER_ADDR, CCNET_SERVER_PORT, \ from service import CCNET_CONF_PATH, CCNET_SERVER_ADDR, CCNET_SERVER_PORT, \
MAX_UPLOAD_FILE_SIZE, MAX_DOWNLOAD_DIR_SIZE, FILE_SERVER_ROOT, \ MAX_UPLOAD_FILE_SIZE, MAX_DOWNLOAD_DIR_SIZE, FILE_SERVER_ROOT, \
CALC_SHARE_USAGE, SERVICE_URL, FILE_SERVER_PORT, SERVER_ID, \ CALC_SHARE_USAGE, SERVICE_URL, FILE_SERVER_PORT, SERVER_ID, \
SEAFILE_CENTRAL_CONF_DIR SEAFILE_CENTRAL_CONF_DIR, LDAP_HOST
from service import send_message from service import send_message

5
python/seaserv/service.py
View File

@@ -60,6 +60,11 @@ else:
CCNET_SERVER_PORT = None CCNET_SERVER_PORT = None
SERVICE_URL = None SERVICE_URL = None
if config.has_option('LDAP', 'HOST'):
LDAP_HOST = config.get('LDAP', 'HOST')
else:
LDAP_HOST = None
SERVER_ID = config.get('General', 'ID') SERVER_ID = config.get('General', 'ID')
config.read(os.path.join(SEAFILE_CENTRAL_CONF_DIR if SEAFILE_CENTRAL_CONF_DIR else SEAFILE_CONF_DIR, config.read(os.path.join(SEAFILE_CENTRAL_CONF_DIR if SEAFILE_CENTRAL_CONF_DIR else SEAFILE_CONF_DIR,
'seafile.conf')) 'seafile.conf'))