diff --git a/scripts/pro.py b/scripts/pro.py index 2bc623b3da..ebb3cac138 100755 --- a/scripts/pro.py +++ b/scripts/pro.py @@ -507,8 +507,6 @@ class ProfessionalConfigurator(object): def generate_seafevents_conf(self): template = '''\ -%(db_config_text)s - [SEAHUB EMAIL] enabled = true @@ -524,13 +522,12 @@ enabled=true enabled = true suffix = md,txt,doc,docx,xls,xlsx,ppt,pptx,sdoc ''' - db_config_text = self.db_config.generate_config_text() if not os.path.exists(env_mgr.pro_data_dir): os.makedirs(env_mgr.pro_data_dir) os.chmod(env_mgr.pro_data_dir, 0o700) with open(self.seafevents_conf, 'w') as fp: - fp.write(template % dict(db_config_text=db_config_text)) + fp.write(template) class SetupProfessionalConfigurator(ProfessionalConfigurator): '''This script is invokded by setup-seafile.sh/setup-seafile-mysql.sh to diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py index 84794f8eec..432f5bb6fb 100644 --- a/scripts/setup-seafile-mysql.py +++ b/scripts/setup-seafile-mysql.py @@ -875,7 +875,7 @@ class SeafileConfigurator(AbstractConfigurator): with open(self.seafile_conf, 'w') as fp: fp.write('[fileserver]\nport=%d\n' % self.fileserver_port) - self.generate_db_conf() + # self.generate_db_conf() ## use default seafile-data path: seafile_data_dir=${TOPDIR}/seafile-data @@ -1006,8 +1006,6 @@ class SeahubConfigurator(AbstractConfigurator): fp.write('\n') self.write_secret_key(fp) fp.write('\n') - fp.write('SERVICE_URL = "%s://%s"' % (self.get_proto(), ccnet_config.ip_or_domain)) - fp.write('\n') def write_utf8_comment(self, fp): fp.write('# -*- coding: utf-8 -*-')