瀏覽代碼

use BIND_ADDR config default for runserver

Nick Sweeting 5 年之前
父節點
當前提交
a0901ba474
共有 3 個文件被更改,包括 4 次插入3 次删除
  1. 2 3
      archivebox/cli/archivebox_server.py
  2. 1 0
      archivebox/config/__init__.py
  3. 1 0
      archivebox/config/stubs.py

+ 2 - 3
archivebox/cli/archivebox_server.py

@@ -10,10 +10,9 @@ from typing import Optional, List, IO
 
 
 from ..main import server
 from ..main import server
 from ..util import docstring
 from ..util import docstring
-from ..config import OUTPUT_DIR
+from ..config import OUTPUT_DIR, BIND_ADDR
 from ..logging_util import SmartFormatter, reject_stdin
 from ..logging_util import SmartFormatter, reject_stdin
 
 
-
 @docstring(server.__doc__)
 @docstring(server.__doc__)
 def main(args: Optional[List[str]]=None, stdin: Optional[IO]=None, pwd: Optional[str]=None) -> None:
 def main(args: Optional[List[str]]=None, stdin: Optional[IO]=None, pwd: Optional[str]=None) -> None:
     parser = argparse.ArgumentParser(
     parser = argparse.ArgumentParser(
@@ -26,7 +25,7 @@ def main(args: Optional[List[str]]=None, stdin: Optional[IO]=None, pwd: Optional
         'runserver_args',
         'runserver_args',
         nargs='*',
         nargs='*',
         type=str,
         type=str,
-        default=None,
+        default=[BIND_ADDR],
         help='Arguments to pass to Django runserver'
         help='Arguments to pass to Django runserver'
     )
     )
     parser.add_argument(
     parser.add_argument(

+ 1 - 0
archivebox/config/__init__.py

@@ -62,6 +62,7 @@ CONFIG_DEFAULTS: Dict[str, ConfigDefaultDict] = {
 
 
     'SERVER_CONFIG': {
     'SERVER_CONFIG': {
         'SECRET_KEY':               {'type': str,   'default': None},
         'SECRET_KEY':               {'type': str,   'default': None},
+        'BIND_ADDR':                {'type': str,   'default': lambda c: ['127.0.0.1:8000', '0.0.0.0:8000'][c['IN_DOCKER']]},
         'ALLOWED_HOSTS':            {'type': str,   'default': '*'},
         'ALLOWED_HOSTS':            {'type': str,   'default': '*'},
         'DEBUG':                    {'type': bool,  'default': False},
         'DEBUG':                    {'type': bool,  'default': False},
         'PUBLIC_INDEX':             {'type': bool,  'default': True},
         'PUBLIC_INDEX':             {'type': bool,  'default': True},

+ 1 - 0
archivebox/config/stubs.py

@@ -40,6 +40,7 @@ class ConfigDict(BaseConfig, total=False):
     URL_BLACKLIST: Optional[str]
     URL_BLACKLIST: Optional[str]
 
 
     SECRET_KEY: str
     SECRET_KEY: str
+    BIND_ADDR: str
     ALLOWED_HOSTS: str
     ALLOWED_HOSTS: str
     DEBUG: bool
     DEBUG: bool
     PUBLIC_INDEX: bool
     PUBLIC_INDEX: bool