haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-01 15:36:37 +00:00
Code Issues Releases Wiki Activity

cleanup code about service_url (#505)

Browse Source
This commit is contained in:
Xiangyue Cai
2021-10-12 16:02:17 +08:00
committed by GitHub
parent aa3ba316ee
commit 9807f23c74
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/seaserv/__init__.py
View File

@@ -32,9 +32,9 @@ 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 get_related_users_by_repo, get_related_users_by_org_repo
from .service import post_empty_file, del_file from .service import post_empty_file, del_file
from .service import CCNET_CONF_PATH, CCNET_SERVER_ADDR, \ from .service import CCNET_CONF_PATH, \
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, \ CALC_SHARE_USAGE, FILE_SERVER_PORT, \
SEAFILE_CENTRAL_CONF_DIR, LDAP_HOST, USE_GO_FILESERVER SEAFILE_CENTRAL_CONF_DIR, LDAP_HOST, USE_GO_FILESERVER
from .service import send_message from .service import send_message

15
python/seaserv/service.py
View File

@@ -43,17 +43,6 @@ config = configparser.ConfigParser()
config.read(os.path.join(SEAFILE_CENTRAL_CONF_DIR if SEAFILE_CENTRAL_CONF_DIR else CCNET_CONF_PATH, config.read(os.path.join(SEAFILE_CENTRAL_CONF_DIR if SEAFILE_CENTRAL_CONF_DIR else CCNET_CONF_PATH,
'ccnet.conf')) 'ccnet.conf'))
if config.has_option('General', 'SERVICE_URL'):
service_url = config.get('General', 'SERVICE_URL')
hostname = urlparse(service_url).hostname
SERVICE_URL = service_url
CCNET_SERVER_ADDR = hostname
else:
print("Warning: SERVICE_URL not set in ccnet.conf")
CCNET_SERVER_ADDR = None
SERVICE_URL = None
if config.has_option('LDAP', 'HOST'): if config.has_option('LDAP', 'HOST'):
LDAP_HOST = config.get('LDAP', 'HOST') LDAP_HOST = config.get('LDAP', 'HOST')
else: else:
@@ -93,10 +82,6 @@ except ValueError:
pass pass
FILE_SERVER_PORT = get_fileserver_option('port', '8082') FILE_SERVER_PORT = get_fileserver_option('port', '8082')
if CCNET_SERVER_ADDR:
FILE_SERVER_ROOT = 'http://' + CCNET_SERVER_ADDR + ':' + FILE_SERVER_PORT
else:
FILE_SERVER_ROOT = None FILE_SERVER_ROOT = None
CALC_SHARE_USAGE = False CALC_SHARE_USAGE = False