From 2fc4579b44331f07805860c6f75444156e382234 Mon Sep 17 00:00:00 2001 From: skywalker Date: Fri, 20 Nov 2020 15:37:03 +0800 Subject: [PATCH] remove ccnet-init --- scripts/check_init_admin.py | 21 ++++--------------- scripts/reset-admin.sh | 1 + scripts/seafile.sh | 2 -- scripts/setup-seafile-mysql.py | 37 +++++++--------------------------- 4 files changed, 12 insertions(+), 49 deletions(-) diff --git a/scripts/check_init_admin.py b/scripts/check_init_admin.py index 8c412d3..cc7bcd3 100644 --- a/scripts/check_init_admin.py +++ b/scripts/check_init_admin.py @@ -16,6 +16,8 @@ import warnings from configparser import ConfigParser +from seaserv import ccnet_api + try: import readline # pylint: disable=W0611 except ImportError: @@ -279,26 +281,12 @@ class InvalidAnswer(Exception): ### END of Utils #################### -class RPC(object): - def __init__(self): - import ccnet - ccnet_dir = os.environ['CCNET_CONF_DIR'] - central_config_dir = os.environ['SEAFILE_CENTRAL_CONF_DIR'] - ccnet_named_pipe_path = ccnet_dir + '/' + 'ccnet-rpc.sock' - self.rpc_client = ccnet.CcnetThreadedRpcClient(ccnet_named_pipe_path) - - def get_db_email_users(self): - return self.rpc_client.get_emailusers('DB', 0, 1) - - def create_admin(self, email, user): - return self.rpc_client.add_emailuser(email, user, 1, 1) - def need_create_admin(): - users = rpc.get_db_email_users() + users = ccnet_api.get_emailusers('DB', 0, 1) return len(users) == 0 def create_admin(email, passwd): - if rpc.create_admin(email, passwd) < 0: + if ccnet_api.add_emailuser(email, passwd, 1, 1) < 0: raise Exception('failed to create admin') else: print('\n\n') @@ -348,7 +336,6 @@ def ask_admin_password(): password=True, validate=validate) -rpc = RPC() def main(): if not need_create_admin(): diff --git a/scripts/reset-admin.sh b/scripts/reset-admin.sh index a77e105..6f4918b 100755 --- a/scripts/reset-admin.sh +++ b/scripts/reset-admin.sh @@ -48,6 +48,7 @@ export CCNET_CONF_DIR=${default_ccnet_conf_dir} export SEAFILE_CONF_DIR=${default_seafile_data_dir} export SEAFILE_CENTRAL_CONF_DIR=${central_config_dir} export PYTHONPATH=${INSTALLPATH}/seafile/lib/python3.6/site-packages:${INSTALLPATH}/seafile/lib64/python3.6/site-packages:${INSTALLPATH}/seahub/thirdpart:$PYTHONPATH +export SEAFILE_RPC_PIPE_PATH=${INSTALLPATH}/runtime manage_py=${INSTALLPATH}/seahub/manage.py exec "$PYTHON" "$manage_py" createsuperuser diff --git a/scripts/seafile.sh b/scripts/seafile.sh index 94c2522..b7753a5 100755 --- a/scripts/seafile.sh +++ b/scripts/seafile.sh @@ -105,7 +105,6 @@ function validate_already_running () { exit 1; fi - check_component_running "ccnet-server" "ccnet-server -c ${default_ccnet_conf_dir}" check_component_running "seaf-server" "seaf-server -c ${default_ccnet_conf_dir}" check_component_running "fileserver" "fileserver -c ${default_ccnet_conf_dir}" check_component_running "seafdav" "wsgidav.server.server_cli" @@ -147,7 +146,6 @@ function stop_seafile_server () { echo "Stopping seafile server ..." pkill -SIGTERM -f "seafile-controller -c ${default_ccnet_conf_dir}" - pkill -f "ccnet-server -c ${default_ccnet_conf_dir}" pkill -f "seaf-server -c ${default_ccnet_conf_dir}" pkill -f "fileserver -c ${default_ccnet_conf_dir}" pkill -f "soffice.*--invisible --nocrashreport" diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py index 5270661..08ec906 100644 --- a/scripts/setup-seafile-mysql.py +++ b/scripts/setup-seafile-mysql.py @@ -132,7 +132,7 @@ Press ENTER to continue if os.path.exists(path): return try: - os.mkdir(path) + os.makedirs(path) except OSError as e: Utils.error('failed to create directory %s:%s' % (path, e)) @@ -805,20 +805,13 @@ class CcnetConfigurator(AbstractConfigurator): def generate(self): print('Generating ccnet configuration ...\n') - ccnet_init = os.path.join(env_mgr.bin_dir, 'ccnet-init') - argv = [ - ccnet_init, - '-F', env_mgr.central_config_dir, - '--config-dir', self.ccnet_dir, - '--host', self.ip_or_domain, - ] + with open(self.ccnet_conf, 'w') as fp: + fp.write('[General]\nSERVICE_URL = http://%s/\n' % self.ip_or_domain) - if Utils.run_argv(argv, env=env_mgr.get_binary_env()) != 0: - Utils.error('Failed to generate ccnet configuration') - - time.sleep(1) self.generate_db_conf() + Utils.must_mkdir(self.ccnet_dir) + def generate_db_conf(self): config = Utils.read_config(self.ccnet_conf) # [Database] @@ -933,22 +926,12 @@ class SeafileConfigurator(AbstractConfigurator): def generate(self): print('Generating seafile configuration ...\n') - seafserv_init = os.path.join(env_mgr.bin_dir, 'seaf-server-init') - argv = [ - seafserv_init, - '-F', env_mgr.central_config_dir, - '--seafile-dir', self.seafile_dir, - '--fileserver-port', str(self.fileserver_port), - ] + with open(self.seafile_conf, 'w') as fp: + fp.write('[fileserver]\nport=%d\n' % self.fileserver_port) - if Utils.run_argv(argv, env=env_mgr.get_binary_env()) != 0: - Utils.error('Failed to generate ccnet configuration') - - time.sleep(1) self.generate_db_conf() ## use default seafile-data path: seafile_data_dir=${TOPDIR}/seafile-data - # self.write_seafile_ini() print('done') @@ -1015,11 +998,6 @@ class SeafileConfigurator(AbstractConfigurator): default=default, validate=Utils.validate_port) - def write_seafile_ini(self): - seafile_ini = os.path.join(ccnet_config.ccnet_dir, 'seafile.ini') - with open(seafile_ini, 'w') as fp: - fp.write(self.seafile_dir) - def do_syncdb(self): print('----------------------------------------') print('Now creating seafile database tables ...\n') @@ -1071,7 +1049,6 @@ class SeahubConfigurator(AbstractConfigurator): def generate(self): '''Generating seahub_settings.py''' print('Generating seahub configuration ...\n') - time.sleep(1) with open(self.seahub_settings_py, 'w') as fp: self.write_utf8_comment(fp) fp.write('\n')