aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mitmproxy/tools/_main.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py
index 8a98278d..a00a3e98 100644
--- a/mitmproxy/tools/_main.py
+++ b/mitmproxy/tools/_main.py
@@ -17,8 +17,6 @@ from mitmproxy import optmanager
from mitmproxy import proxy
from mitmproxy.utils import debug, arg_check
-OPTIONS_FILE_NAME = "config.yaml"
-
def assert_utf8_env():
spec = ""
@@ -89,7 +87,8 @@ def run(
opts.set(*args.setoptions, defer=True)
optmanager.load_paths(
opts,
- os.path.join(opts.confdir, OPTIONS_FILE_NAME),
+ os.path.join(opts.confdir, "config.yaml"),
+ os.path.join(opts.confdir, "config.yml"),
)
pconf = process_options(parser, opts, args)
server: typing.Any = None