ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2057 from emanuelschuetze/fix1987

Browse Source 
Use specific host and port for 'openslides start' (Fixes #1987)
This commit is contained in:
Norman Jäckel 2016-03-21 00:22:06 +01:00
commit aa122263e1
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openslides/__main__.py
View File

@ -97,6 +97,16 @@ def get_parser():
'--no-browser', '--no-browser',
action='store_true', action='store_true',
help='Do not launch the default web browser.') help='Do not launch the default web browser.')
subcommand_start.add_argument(
'--host',
action='store',
default='0.0.0.0',
help='IP address to listen on. Default is 0.0.0.0.')
subcommand_start.add_argument(
'--port',
action='store',
default='8000',
help='Port to listen on. Default is 8000.')
subcommand_start.add_argument( subcommand_start.add_argument(
'--settings_path', '--settings_path',
action='store', action='store',
@ -165,12 +175,17 @@ def start(args):
execute_from_command_line(['manage.py', 'migrate']) execute_from_command_line(['manage.py', 'migrate'])
# Open the browser
if not args.no_browser: if not args.no_browser:
start_browser('http://localhost:8000') if args.host == '0.0.0.0':
# Windows does not support 0.0.0.0, so use 'localhost' instead
start_browser('http://localhost:%s' % args.port)
else:
start_browser('http://%s:%s' % (args.host, args.port))
# Start the webserver # Start the webserver
# Tell django not to reload. OpenSlides uses the reload method from tornado # Tell django not to reload. OpenSlides uses the reload method from tornado
execute_from_command_line(['manage.py', 'runserver', '0.0.0.0:8000', '--noreload']) execute_from_command_line(['manage.py', 'runserver', '%s:%s' % (args.host, args.port), '--noreload'])
def createsettings(args): def createsettings(args):