diff options
| author | Maxim Devaev <[email protected]> | 2022-03-27 22:50:35 +0300 |
|---|---|---|
| committer | Maxim Devaev <[email protected]> | 2022-03-27 22:50:35 +0300 |
| commit | 056f0693466104180beb201b9eb45ff0d04babca (patch) | |
| tree | 95133f38bdcd7b46f43af7a23471cc886aed9e76 /kvmd/apps/__init__.py | |
| parent | 8775cd22860a21d5b93dc3c691e25d33571e02eb (diff) | |
removed unused network code and simplified configs
Diffstat (limited to 'kvmd/apps/__init__.py')
| -rw-r--r-- | kvmd/apps/__init__.py | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py index 59490fc5..521c73db 100644 --- a/kvmd/apps/__init__.py +++ b/kvmd/apps/__init__.py @@ -343,9 +343,7 @@ def _get_config_scheme() -> Dict: "kvmd": { "server": { - "host": Option("localhost", type=valid_ip_or_host), - "port": Option(0, type=valid_port), - "unix": Option("", type=valid_abs_path, only_if="!port", unpack_as="unix_path"), + "unix": Option("/run/kvmd/kvmd.sock", type=valid_abs_path, unpack_as="unix_path"), "unix_rm": Option(True, type=valid_bool), "unix_mode": Option(0o660, type=valid_unix_mode), "heartbeat": Option(15.0, type=valid_float_f01), @@ -447,9 +445,7 @@ def _get_config_scheme() -> Dict: "max": Option(60, type=valid_stream_h264_gop, unpack_as="h264_gop_max"), }, - "host": Option("localhost", type=valid_ip_or_host), - "port": Option(0, type=valid_port), - "unix": Option("", type=valid_abs_path, only_if="!port", unpack_as="unix_path"), + "unix": Option("/run/kvmd/ustreamer.sock", type=valid_abs_path, unpack_as="unix_path"), "timeout": Option(2.0, type=valid_float_f01), "process_name_prefix": Option("kvmd/streamer"), @@ -600,9 +596,7 @@ def _get_config_scheme() -> Dict: }, "kvmd": { - "host": Option("localhost", type=valid_ip_or_host), - "port": Option(0, type=valid_port), - "unix": Option("", type=valid_abs_path, only_if="!port", unpack_as="unix_path"), + "unix": Option("/run/kvmd/kvmd.sock", type=valid_abs_path, unpack_as="unix_path"), "timeout": Option(5.0, type=valid_float_f01), }, @@ -646,16 +640,12 @@ def _get_config_scheme() -> Dict: }, "kvmd": { - "host": Option("localhost", type=valid_ip_or_host), - "port": Option(0, type=valid_port), - "unix": Option("", type=valid_abs_path, only_if="!port", unpack_as="unix_path"), + "unix": Option("/run/kvmd/kvmd.sock", type=valid_abs_path, unpack_as="unix_path"), "timeout": Option(5.0, type=valid_float_f01), }, "streamer": { - "host": Option("localhost", type=valid_ip_or_host), - "port": Option(0, type=valid_port), - "unix": Option("", type=valid_abs_path, only_if="!port", unpack_as="unix_path"), + "unix": Option("/run/kvmd/ustreamer.sock", type=valid_abs_path, unpack_as="unix_path"), "timeout": Option(5.0, type=valid_float_f01), }, |