Skip to content

J
jumpserver
Commit 655bfc85 authored by ibuler's avatar ibuler
Browse files
Options

fix install bug

parent 439efa1c
master auditor_jym audits dev dev_beta dev_beta_db gengmei lagacy-0.4.0 node_service password rbac restrict_access test v52 wph 1.5.2 1.5.1 1.5.0 1.4.10 1.4.9 1.4.8 1.4.7 1.4.6 1.4.5 1.4.4 1.4.3 1.4.2 1.4.1 1.4.0 1.3.3 1.3.2 1.3.1 1.3.0 1.2.1 1.2.0 1.1.1 1.1.0 1.0.0 0.3.3 0.3.2 0.3.2-rc2 0.3.1 0.3.0-beta v1.4.10 v1.4.7 v1.4.4
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
install/install.py
View file @ 655bfc85
...@@ -80,9 +80,9 @@ class PreSetup(object): ...@@ -80,9 +80,9 @@ class PreSetup(object):
conf.set('db', 'host', self.db_host) conf.set('db', 'host', self.db_host)
conf.set('db', 'port', self.db_port) conf.set('db', 'port', self.db_port)
conf.set('db', 'user', self.db_user) conf.set('db', 'user', self.db_user)
conf.set('db', 'pass', self.db_pass) conf.set('db', 'password', self.db_pass)
conf.set('db', 'database', self.db) conf.set('db', 'database', self.db)
conf.set('websocket', 'web_socket_host', '%s: 3000' % self.ip) conf.set('websocket', 'web_socket_host', '%s:3000' % self.ip)
conf.set('mail', 'email_host', self.mail_host) conf.set('mail', 'email_host', self.mail_host)
conf.set('mail', 'email_port', self.mail_port) conf.set('mail', 'email_port', self.mail_port)
conf.set('mail', 'email_host_user', self.mail_addr) conf.set('mail', 'email_host_user', self.mail_addr)
...@@ -207,7 +207,8 @@ class PreSetup(object): ...@@ -207,7 +207,8 @@ class PreSetup(object):
self._input_mysql() self._input_mysql()
self._input_smtp() self._input_smtp()
self.write_conf() self.write_conf()
os.system('python next.py') os.chdir(jms_dir)
os.system('python %s' % os.path.join(jms_dir, 'install/next.py'))
if __name__ == '__main__': if __name__ == '__main__':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment