rm CCNET_CONF_DIR (#7670)

scripts/migrate-repo.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 default_conf_dir=${TOPDIR}/conf
 seafile_rpc_pipe_path=${INSTALLPATH}/runtime
@@ -47,7 +46,6 @@ function check_python_executable() {
 }
 
 function do_migrate () {
-    export CCNET_CONF_DIR=${default_ccnet_conf_dir}
     export SEAFILE_CONF_DIR=${default_seafile_data_dir}
     export SEAFILE_CENTRAL_CONF_DIR=${default_conf_dir}
     export SEAFILE_RPC_PIPE_PATH=${seafile_rpc_pipe_path}

scripts/migrate.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 default_conf_dir=${TOPDIR}/conf
 
@@ -44,7 +43,6 @@ function check_python_executable() {
 }
 
 function do_migrate () {
-    export CCNET_CONF_DIR=${default_ccnet_conf_dir}
     export SEAFILE_CONF_DIR=${default_seafile_data_dir}
     export SEAFILE_CENTRAL_CONF_DIR=${default_conf_dir}
     export DEST_SEAFILE_CENTRAL_CONF_DIR=${dest_seafile_central_conf_dir}

scripts/pro.py

@@ -335,7 +335,6 @@ class EnvManager(object):
     def get_seahub_env(self):
         '''Prepare for seahub syncdb'''
         env = dict(os.environ)
-        env['CCNET_CONF_DIR'] = self.ccnet_dir
         env['SEAFILE_CONF_DIR'] = self.seafile_dir
         env['SEAFILE_CENTRAL_CONF_DIR'] = self.central_config_dir
         env['SEAFILE_RPC_PIPE_PATH'] = self.seafile_rpc_pipe_path
@@ -345,7 +344,7 @@ class EnvManager(object):
         return env
 
     def setup_python_path(self, env):
-        '''And PYTHONPATH and CCNET_CONF_DIR/SEAFILE_CONF_DIR to env, which is
+        '''And PYTHONPATH and SEAFILE_CONF_DIR to env, which is
         needed by seahub
 
         '''

scripts/remove-objs.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 default_conf_dir=${TOPDIR}/conf
 seafile_rpc_pipe_path=${INSTALLPATH}/runtime
@@ -46,7 +45,6 @@ function check_python_executable() {
 }
 
 function do_remove () {
-    export CCNET_CONF_DIR=${default_ccnet_conf_dir}
     export SEAFILE_CONF_DIR=${default_seafile_data_dir}
     export SEAFILE_CENTRAL_CONF_DIR=${default_conf_dir}
     export SEAFILE_RPC_PIPE_PATH=${seafile_rpc_pipe_path}

scripts/reset-admin.sh

@@ -3,7 +3,6 @@
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 central_config_dir=${TOPDIR}/conf
 pro_pylibs_dir=${INSTALLPATH}/pro/python
@@ -59,7 +58,6 @@ check_python_executable;
 validate_seafile_data_dir;
 prepare_seahub_log_dir;
 
-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/site-packages:${INSTALLPATH}/seafile/lib64/python3/site-packages:${INSTALLPATH}/seahub/thirdpart:$PYTHONPATH

scripts/run_index_master.sh

@@ -3,7 +3,6 @@
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 central_config_dir=${TOPDIR}/conf
 pro_pylibs_dir=${INSTALLPATH}/pro/python

scripts/run_index_worker.sh

@@ -1,7 +1,6 @@
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 central_config_dir=${TOPDIR}/conf
 pro_pylibs_dir=${INSTALLPATH}/pro/python

scripts/seaf-backup-cmd.sh

@@ -43,7 +43,6 @@ SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
 central_config_dir=${TOPDIR}/conf
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 
 
@@ -64,7 +63,6 @@ SEAF_BACKUP_CMD=${INSTALLPATH}/seaf-backup-cmd.py
 
 export SEAFILE_RPC_PIPE_PATH=${INSTALLPATH}/runtime
 export PYTHONPATH=${SEAFILE_PYTHON_PATH}:${PYTHONPATH}
-export CCNET_CONF_DIR=${default_ccnet_conf_dir}
 export SEAFILE_CONF_DIR=${default_seafile_data_dir}
 export SEAFILE_CENTRAL_CONF_DIR=${central_config_dir}
 $PYTHON ${SEAF_BACKUP_CMD} "$@"

scripts/seaf-encrypt.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 default_conf_dir=${TOPDIR}/conf
 seaf_encrypt=${INSTALLPATH}/seafile/bin/seaf-encrypt

scripts/seaf-fsck.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 default_conf_dir=${TOPDIR}/conf
 seaf_fsck=${INSTALLPATH}/seafile/bin/seaf-fsck
@@ -67,7 +66,7 @@ function run_seaf_fsck () {
     echo
 
     LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_fsck} \
-        -c "${default_ccnet_conf_dir}" -d "${default_seafile_data_dir}" \
+        -d "${default_seafile_data_dir}" \
         -F "${default_conf_dir}" \
         ${seaf_fsck_opts}
 

scripts/seaf-fuse.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 default_conf_dir=${TOPDIR}/conf
 seaf_fuse=${INSTALLPATH}/seafile/bin/seaf-fuse
@@ -102,7 +101,6 @@ function start_seaf_fuse () {
     logfile=${TOPDIR}/logs/seaf-fuse.log
 
     LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_fuse} \
-        -c "${default_ccnet_conf_dir}" \
         -d "${default_seafile_data_dir}" \
         -F "${default_conf_dir}" \
         -l "${logfile}" \

scripts/seaf-gc.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 default_conf_dir=${TOPDIR}/conf
 seaf_gc=${INSTALLPATH}/seafile/bin/seafserv-gc
@@ -125,7 +124,6 @@ function run_seaf_gc () {
     echo "Starting seafserv-gc, please wait ..."
 
     LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_gc} \
-        -c "${default_ccnet_conf_dir}" \
         -d "${default_seafile_data_dir}" \
         -F "${default_conf_dir}" \
         ${seaf_gc_opts}

scripts/seaf-import.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 default_conf_dir=${TOPDIR}/conf
 seaf_import=${INSTALLPATH}/seafile/bin/seaf-import

scripts/seafile-background-tasks.sh

@@ -5,7 +5,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 
 logdir=${TOPDIR}/logs
@@ -101,7 +100,6 @@ function before_start() {
     ensure_single_instance;
     prepare_log_dir;
 
-    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 SEAFILE_RPC_PIPE_PATH=${INSTALLPATH}/runtime

scripts/seafile-monitor.sh

@@ -3,7 +3,6 @@
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 central_config_dir=${TOPDIR}/conf
 pro_pylibs_dir=${INSTALLPATH}/pro/python
@@ -15,7 +14,6 @@ IS_PRO_SEAFEVENTS=`awk '/is_pro/{getline;print $2;exit}' ${pro_pylibs_dir}/seafe
 export PATH=${INSTALLPATH}/seafile/bin:$PATH
 export ORIG_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
-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 SEAFILE_RPC_PIPE_PATH=${seafile_rpc_pipe_path}
@@ -119,7 +117,6 @@ function start_seaf_server() {
     if [[ $IS_PRO_SEAFEVENTS = "True" ]]; then
         LD_LIBRARY_PATH=${SEAFILE_LD_LIBRARY_PATH} ${INSTALLPATH}/seafile/bin/seaf-server \
             -F ${SEAFILE_CENTRAL_CONF_DIR} \
-            -c ${CCNET_CONF_DIR} \
             -d ${SEAFILE_CONF_DIR} \
             -l ${TOPDIR}/logs/seafile.log \
             -P ${TOPDIR}/pids/seaf-server.pid \
@@ -128,7 +125,6 @@ function start_seaf_server() {
     else
         LD_LIBRARY_PATH=${SEAFILE_LD_LIBRARY_PATH} ${INSTALLPATH}/seafile/bin/seaf-server \
             -F ${SEAFILE_CENTRAL_CONF_DIR} \
-            -c ${CCNET_CONF_DIR} \
             -d ${SEAFILE_CONF_DIR} \
             -l ${TOPDIR}/logs/seafile.log \
             -P ${TOPDIR}/pids/seaf-server.pid \

scripts/seafile.sh

@@ -15,7 +15,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 central_config_dir=${TOPDIR}/conf
 pro_pylibs_dir=${INSTALLPATH}/pro/python
@@ -28,7 +27,6 @@ export PATH=${INSTALLPATH}/seafile/bin:$PATH
 export ORIG_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
 export SEAFILE_CENTRAL_CONF_DIR=${central_config_dir}
-export CCNET_CONF_DIR=${default_ccnet_conf_dir}
 export SEAFILE_CONF_DIR=${default_seafile_data_dir}
 export SEAFILE_RPC_PIPE_PATH=${seafile_rpc_pipe_path}
 export SEAHUB_DIR=$seahubdir
@@ -156,7 +154,6 @@ function start_seafile_server () {
     if [[ $IS_PRO_SEAFEVENTS = "True" ]]; then
         LD_LIBRARY_PATH=${SEAFILE_LD_LIBRARY_PATH} ${INSTALLPATH}/seafile/bin/seaf-server \
             -F ${SEAFILE_CENTRAL_CONF_DIR} \
-            -c ${CCNET_CONF_DIR} \
             -d ${SEAFILE_CONF_DIR} \
             -l ${TOPDIR}/logs/seafile.log \
             -P ${TOPDIR}/pids/seaf-server.pid \
@@ -165,7 +162,6 @@ function start_seafile_server () {
     else
         LD_LIBRARY_PATH=${SEAFILE_LD_LIBRARY_PATH} ${INSTALLPATH}/seafile/bin/seaf-server \
             -F ${SEAFILE_CENTRAL_CONF_DIR} \
-            -c ${CCNET_CONF_DIR} \
             -d ${SEAFILE_CONF_DIR} \
             -l ${TOPDIR}/logs/seafile.log \
             -P ${TOPDIR}/pids/seaf-server.pid \

scripts/seahub.sh

@@ -15,7 +15,6 @@ echo ""
 SCRIPT=$(readlink -f "$0")
 INSTALLPATH=$(dirname "${SCRIPT}")
 TOPDIR=$(dirname "${INSTALLPATH}")
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 central_config_dir=${TOPDIR}/conf
 seafile_rpc_pipe_path=${INSTALLPATH}/runtime
@@ -231,7 +230,6 @@ function prepare_env() {
         export LC_ALL='en_US.UTF-8'
     fi
 
-    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 SEAFILE_RPC_PIPE_PATH=${seafile_rpc_pipe_path}

scripts/setup-seafile-mysql.py

@@ -320,20 +320,16 @@ class EnvManager(object):
         for path in paths:
             error_if_not_exists(path)
 
-        if os.path.exists(ccnet_config.ccnet_dir):
-            Utils.error('Ccnet config dir \"%s\" already exists.' % ccnet_config.ccnet_dir)
-
     def get_seahub_env(self):
         '''Prepare for seahub syncdb'''
         env = dict(os.environ)
-        env['CCNET_CONF_DIR'] = ccnet_config.ccnet_dir
         env['SEAFILE_CONF_DIR'] = seafile_config.seafile_dir
         env['SEAFES_DIR'] = os.path.join(self.install_path, 'pro', 'python', 'seafes')
         self.setup_python_path(env)
         return env
 
     def setup_python_path(self, env):
-        '''And PYTHONPATH and CCNET_CONF_DIR/SEAFILE_CONF_DIR to env, which is
+        '''And PYTHONPATH and SEAFILE_CONF_DIR to env, which is
         needed by seahub
 
         '''
@@ -761,15 +757,6 @@ class CcnetConfigurator(AbstractConfigurator):
             self.ask_server_ip_or_domain()
         # self.ask_port()
 
-    def generate(self):
-        print('Generating ccnet configuration ...\n')
-        with open(self.ccnet_conf, 'w') as fp:
-            fp.write('[General]')
-
-        self.generate_db_conf()
-
-        Utils.must_mkdir(self.ccnet_dir)
-
     def generate_db_conf(self):
         config = Utils.read_config(self.ccnet_conf)
         # [Database]
@@ -1362,7 +1349,6 @@ def set_file_perm():
     ]
     dirs = [
         env_mgr.central_config_dir,
-        ccnet_config.ccnet_dir,
         seafile_config.seafile_dir,
         seahub_config.seahub_settings_py,
     ]
@@ -1541,8 +1527,6 @@ def main():
 
     # Part 2: generate configuration
     db_config.generate()
-    # ccnet_config.generate()  # do not create ccnet.conf
-    Utils.must_mkdir(ccnet_config.ccnet_dir)
     seafile_config.generate()
     seafdav_config.generate()
     gunicorn_config.generate()

scripts/upgrade/minor-upgrade.sh

@@ -18,7 +18,6 @@ orig_avatar_dir=${INSTALLPATH}/seahub/media/avatars
 dest_avatar_dir=${TOPDIR}/seahub-data/avatars
 seafile_server_symlink=${TOPDIR}/seafile-server-latest
 default_conf_dir=${TOPDIR}/conf
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_seafile_data_dir=${TOPDIR}/seafile-data
 seahub_data_dir=${TOPDIR}/seahub-data
 elasticsearch_config_file=${seafile_server_symlink}/pro/elasticsearch/config/jvm.options

scripts/upgrade/upgrade_12.0_13.0.sh

@@ -4,7 +4,6 @@ SCRIPT=$(readlink -f "$0") # haiwen/seafile-server-1.3.0/upgrade/upgrade_xx_xx.s
 UPGRADE_DIR=$(dirname "$SCRIPT") # haiwen/seafile-server-1.3.0/upgrade/
 INSTALLPATH=$(dirname "$UPGRADE_DIR") # haiwen/seafile-server-1.3.0/
 TOPDIR=$(dirname "${INSTALLPATH}") # haiwen/
-default_ccnet_conf_dir=${TOPDIR}/ccnet
 default_conf_dir=${TOPDIR}/conf
 default_pids_dir=${TOPDIR}/pids
 default_logs_dir=${TOPDIR}/logs
@@ -14,7 +13,6 @@ seahub_data_dir=${TOPDIR}/seahub-data
 
 manage_py=${INSTALLPATH}/seahub/manage.py
 
-export CCNET_CONF_DIR=${default_ccnet_conf_dir}
 export SEAFILE_CONF_DIR=${default_seafile_data_dir}
 export SEAFILE_CENTRAL_CONF_DIR=${default_conf_dir}
 export PYTHONPATH=${INSTALLPATH}/seafile/lib/python3/site-packages:${INSTALLPATH}/seafile/lib64/python3/site-packages:${INSTALLPATH}/seahub:${INSTALLPATH}/seahub/thirdpart:$PYTHONPATH