diff --git a/python/seaserv/__init__.py b/python/seaserv/__init__.py index 5b51dfe..5103fe8 100644 --- a/python/seaserv/__init__.py +++ b/python/seaserv/__init__.py @@ -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 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, \ - CALC_SHARE_USAGE, SERVICE_URL, FILE_SERVER_PORT, \ + CALC_SHARE_USAGE, FILE_SERVER_PORT, \ SEAFILE_CENTRAL_CONF_DIR, LDAP_HOST, USE_GO_FILESERVER from .service import send_message diff --git a/python/seaserv/service.py b/python/seaserv/service.py index 3c24317..733fbcd 100644 --- a/python/seaserv/service.py +++ b/python/seaserv/service.py @@ -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, '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'): LDAP_HOST = config.get('LDAP', 'HOST') else: @@ -93,11 +82,7 @@ except ValueError: pass 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 if config.has_option('quota', 'calc_share_usage'):