diff --git a/README.md b/README.md index 0ba8aa1..9efe6a6 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,11 @@ [🇷🇺 README на русском](https://github.com/telemt/telemt/blob/main/README.ru.md) -***Löst Probleme, bevor andere überhaupt wissen, dass sie existieren*** / ***It solves problems before others even realize they exist*** - > [!NOTE] > -> Fixed TLS ClientHello is now available in official clients for Desktop / Android / iOS +> Telegram Clients TLS ClientHello has been banned by JA3 Fingerprint: we are already looking for ways to solve this problem > -> To work with EE-MTProxy, please update your client! +> You can try build your client with our Telegram Devlibrary - [tdlib-obf](https://github.com/telemt/tdlib-obf)

diff --git a/docker-compose.yml b/docker-compose.yml index e295f0a..a90efde 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,4 +37,9 @@ services: ulimits: nofile: soft: 65536 - hard: 262144 \ No newline at end of file + hard: 262144 + logging: + driver: json-file + options: + max-size: "50m" + max-file: "5" diff --git a/docs/Config_params/CONFIG_PARAMS.en.md b/docs/Config_params/CONFIG_PARAMS.en.md index 5bb1c80..f28e338 100644 --- a/docs/Config_params/CONFIG_PARAMS.en.md +++ b/docs/Config_params/CONFIG_PARAMS.en.md @@ -85,145 +85,7 @@ This document lists all configuration keys accepted by `config.toml`. # [general] -| Key | Type | Default | -| --- | ---- | ------- | -| [`data_path`](#data_path) | `String` | — | -| [`prefer_ipv6`](#prefer_ipv6) | `bool` | `false` | -| [`fast_mode`](#fast_mode) | `bool` | `true` | -| [`use_middle_proxy`](#use_middle_proxy) | `bool` | `true` | -| [`proxy_secret_path`](#proxy_secret_path) | `String` | `"proxy-secret"` | -| [`proxy_config_v4_cache_path`](#proxy_config_v4_cache_path) | `String` | `"cache/proxy-config-v4.txt"` | -| [`proxy_config_v6_cache_path`](#proxy_config_v6_cache_path) | `String` | `"cache/proxy-config-v6.txt"` | -| [`ad_tag`](#ad_tag) | `String` | — | -| [`middle_proxy_nat_ip`](#middle_proxy_nat_ip) | `IpAddr` | — | -| [`middle_proxy_nat_probe`](#middle_proxy_nat_probe) | `bool` | `true` | -| [`middle_proxy_nat_stun`](#middle_proxy_nat_stun) | `String` | — | -| [`middle_proxy_nat_stun_servers`](#middle_proxy_nat_stun_servers) | `String[]` | `[]` | -| [`stun_nat_probe_concurrency`](#stun_nat_probe_concurrency) | `usize` | `8` | -| [`middle_proxy_pool_size`](#middle_proxy_pool_size) | `usize` | `8` | -| [`middle_proxy_warm_standby`](#middle_proxy_warm_standby) | `usize` | `16` | -| [`me_init_retry_attempts`](#me_init_retry_attempts) | `u32` | `0` | -| [`me2dc_fallback`](#me2dc_fallback) | `bool` | `true` | -| [`me2dc_fast`](#me2dc_fast) | `bool` | `true` | -| [`me_keepalive_enabled`](#me_keepalive_enabled) | `bool` | `true` | -| [`me_keepalive_interval_secs`](#me_keepalive_interval_secs) | `u64` | `8` | -| [`me_keepalive_jitter_secs`](#me_keepalive_jitter_secs) | `u64` | `2` | -| [`me_keepalive_payload_random`](#me_keepalive_payload_random) | `bool` | `true` | -| [`rpc_proxy_req_every`](#rpc_proxy_req_every) | `u64` | `0` | -| [`me_writer_cmd_channel_capacity`](#me_writer_cmd_channel_capacity) | `usize` | `4096` | -| [`me_route_channel_capacity`](#me_route_channel_capacity) | `usize` | `768` | -| [`me_c2me_channel_capacity`](#me_c2me_channel_capacity) | `usize` | `1024` | -| [`me_c2me_send_timeout_ms`](#me_c2me_send_timeout_ms) | `u64` | `4000` | -| [`me_reader_route_data_wait_ms`](#me_reader_route_data_wait_ms) | `u64` | `2` | -| [`me_d2c_flush_batch_max_frames`](#me_d2c_flush_batch_max_frames) | `usize` | `32` | -| [`me_d2c_flush_batch_max_bytes`](#me_d2c_flush_batch_max_bytes) | `usize` | `131072` | -| [`me_d2c_flush_batch_max_delay_us`](#me_d2c_flush_batch_max_delay_us) | `u64` | `500` | -| [`me_d2c_ack_flush_immediate`](#me_d2c_ack_flush_immediate) | `bool` | `true` | -| [`me_quota_soft_overshoot_bytes`](#me_quota_soft_overshoot_bytes) | `u64` | `65536` | -| [`me_d2c_frame_buf_shrink_threshold_bytes`](#me_d2c_frame_buf_shrink_threshold_bytes) | `usize` | `262144` | -| [`direct_relay_copy_buf_c2s_bytes`](#direct_relay_copy_buf_c2s_bytes) | `usize` | `65536` | -| [`direct_relay_copy_buf_s2c_bytes`](#direct_relay_copy_buf_s2c_bytes) | `usize` | `262144` | -| [`crypto_pending_buffer`](#crypto_pending_buffer) | `usize` | `262144` | -| [`max_client_frame`](#max_client_frame) | `usize` | `16777216` | -| [`desync_all_full`](#desync_all_full) | `bool` | `false` | -| [`beobachten`](#beobachten) | `bool` | `true` | -| [`beobachten_minutes`](#beobachten_minutes) | `u64` | `10` | -| [`beobachten_flush_secs`](#beobachten_flush_secs) | `u64` | `15` | -| [`beobachten_file`](#beobachten_file) | `String` | `"cache/beobachten.txt"` | -| [`hardswap`](#hardswap) | `bool` | `true` | -| [`me_warmup_stagger_enabled`](#me_warmup_stagger_enabled) | `bool` | `true` | -| [`me_warmup_step_delay_ms`](#me_warmup_step_delay_ms) | `u64` | `500` | -| [`me_warmup_step_jitter_ms`](#me_warmup_step_jitter_ms) | `u64` | `300` | -| [`me_reconnect_max_concurrent_per_dc`](#me_reconnect_max_concurrent_per_dc) | `u32` | `8` | -| [`me_reconnect_backoff_base_ms`](#me_reconnect_backoff_base_ms) | `u64` | `500` | -| [`me_reconnect_backoff_cap_ms`](#me_reconnect_backoff_cap_ms) | `u64` | `30000` | -| [`me_reconnect_fast_retry_count`](#me_reconnect_fast_retry_count) | `u32` | `16` | -| [`me_single_endpoint_shadow_writers`](#me_single_endpoint_shadow_writers) | `u8` | `2` | -| [`me_single_endpoint_outage_mode_enabled`](#me_single_endpoint_outage_mode_enabled) | `bool` | `true` | -| [`me_single_endpoint_outage_disable_quarantine`](#me_single_endpoint_outage_disable_quarantine) | `bool` | `true` | -| [`me_single_endpoint_outage_backoff_min_ms`](#me_single_endpoint_outage_backoff_min_ms) | `u64` | `250` | -| [`me_single_endpoint_outage_backoff_max_ms`](#me_single_endpoint_outage_backoff_max_ms) | `u64` | `3000` | -| [`me_single_endpoint_shadow_rotate_every_secs`](#me_single_endpoint_shadow_rotate_every_secs) | `u64` | `900` | -| [`me_floor_mode`](#me_floor_mode) | `"static"` or `"adaptive"` | `"adaptive"` | -| [`me_adaptive_floor_idle_secs`](#me_adaptive_floor_idle_secs) | `u64` | `90` | -| [`me_adaptive_floor_min_writers_single_endpoint`](#me_adaptive_floor_min_writers_single_endpoint) | `u8` | `1` | -| [`me_adaptive_floor_min_writers_multi_endpoint`](#me_adaptive_floor_min_writers_multi_endpoint) | `u8` | `1` | -| [`me_adaptive_floor_recover_grace_secs`](#me_adaptive_floor_recover_grace_secs) | `u64` | `180` | -| [`me_adaptive_floor_writers_per_core_total`](#me_adaptive_floor_writers_per_core_total) | `u16` | `48` | -| [`me_adaptive_floor_cpu_cores_override`](#me_adaptive_floor_cpu_cores_override) | `u16` | `0` | -| [`me_adaptive_floor_max_extra_writers_single_per_core`](#me_adaptive_floor_max_extra_writers_single_per_core) | `u16` | `1` | -| [`me_adaptive_floor_max_extra_writers_multi_per_core`](#me_adaptive_floor_max_extra_writers_multi_per_core) | `u16` | `2` | -| [`me_adaptive_floor_max_active_writers_per_core`](#me_adaptive_floor_max_active_writers_per_core) | `u16` | `64` | -| [`me_adaptive_floor_max_warm_writers_per_core`](#me_adaptive_floor_max_warm_writers_per_core) | `u16` | `64` | -| [`me_adaptive_floor_max_active_writers_global`](#me_adaptive_floor_max_active_writers_global) | `u32` | `256` | -| [`me_adaptive_floor_max_warm_writers_global`](#me_adaptive_floor_max_warm_writers_global) | `u32` | `256` | -| [`upstream_connect_retry_attempts`](#upstream_connect_retry_attempts) | `u32` | `2` | -| [`upstream_connect_retry_backoff_ms`](#upstream_connect_retry_backoff_ms) | `u64` | `100` | -| [`upstream_connect_budget_ms`](#upstream_connect_budget_ms) | `u64` | `3000` | -| [`upstream_unhealthy_fail_threshold`](#upstream_unhealthy_fail_threshold) | `u32` | `5` | -| [`upstream_connect_failfast_hard_errors`](#upstream_connect_failfast_hard_errors) | `bool` | `false` | -| [`stun_iface_mismatch_ignore`](#stun_iface_mismatch_ignore) | `bool` | `false` | -| [`unknown_dc_log_path`](#unknown_dc_log_path) | `String` | `"unknown-dc.txt"` | -| [`unknown_dc_file_log_enabled`](#unknown_dc_file_log_enabled) | `bool` | `false` | -| [`log_level`](#log_level) | `"debug"`, `"verbose"`, `"normal"`, or `"silent"` | `"normal"` | -| [`disable_colors`](#disable_colors) | `bool` | `false` | -| [`me_socks_kdf_policy`](#me_socks_kdf_policy) | `"strict"` or `"compat"` | `"strict"` | -| [`me_route_backpressure_enabled`](#me_route_backpressure_enabled) | `bool` | `false` | -| [`me_route_fairshare_enabled`](#me_route_fairshare_enabled) | `bool` | `false` | -| [`me_route_backpressure_base_timeout_ms`](#me_route_backpressure_base_timeout_ms) | `u64` | `25` | -| [`me_route_backpressure_high_timeout_ms`](#me_route_backpressure_high_timeout_ms) | `u64` | `120` | -| [`me_route_backpressure_high_watermark_pct`](#me_route_backpressure_high_watermark_pct) | `u8` | `80` | -| [`me_health_interval_ms_unhealthy`](#me_health_interval_ms_unhealthy) | `u64` | `1000` | -| [`me_health_interval_ms_healthy`](#me_health_interval_ms_healthy) | `u64` | `3000` | -| [`me_admission_poll_ms`](#me_admission_poll_ms) | `u64` | `1000` | -| [`me_warn_rate_limit_ms`](#me_warn_rate_limit_ms) | `u64` | `5000` | -| [`me_route_no_writer_mode`](#me_route_no_writer_mode) | `"async_recovery_failfast"`, `"inline_recovery_legacy"`, or `"hybrid_async_persistent"` | `"hybrid_async_persistent"` | -| [`me_route_no_writer_wait_ms`](#me_route_no_writer_wait_ms) | `u64` | `250` | -| [`me_route_hybrid_max_wait_ms`](#me_route_hybrid_max_wait_ms) | `u64` | `3000` | -| [`me_route_blocking_send_timeout_ms`](#me_route_blocking_send_timeout_ms) | `u64` | `250` | -| [`me_route_inline_recovery_attempts`](#me_route_inline_recovery_attempts) | `u32` | `3` | -| [`me_route_inline_recovery_wait_ms`](#me_route_inline_recovery_wait_ms) | `u64` | `3000` | -| [`fast_mode_min_tls_record`](#fast_mode_min_tls_record) | `usize` | `0` | -| [`update_every`](#update_every) | `u64` | `300` | -| [`me_reinit_every_secs`](#me_reinit_every_secs) | `u64` | `900` | -| [`me_hardswap_warmup_delay_min_ms`](#me_hardswap_warmup_delay_min_ms) | `u64` | `1000` | -| [`me_hardswap_warmup_delay_max_ms`](#me_hardswap_warmup_delay_max_ms) | `u64` | `2000` | -| [`me_hardswap_warmup_extra_passes`](#me_hardswap_warmup_extra_passes) | `u8` | `3` | -| [`me_hardswap_warmup_pass_backoff_base_ms`](#me_hardswap_warmup_pass_backoff_base_ms) | `u64` | `500` | -| [`me_config_stable_snapshots`](#me_config_stable_snapshots) | `u8` | `2` | -| [`me_config_apply_cooldown_secs`](#me_config_apply_cooldown_secs) | `u64` | `300` | -| [`me_snapshot_require_http_2xx`](#me_snapshot_require_http_2xx) | `bool` | `true` | -| [`me_snapshot_reject_empty_map`](#me_snapshot_reject_empty_map) | `bool` | `true` | -| [`me_snapshot_min_proxy_for_lines`](#me_snapshot_min_proxy_for_lines) | `u32` | `1` | -| [`proxy_secret_stable_snapshots`](#proxy_secret_stable_snapshots) | `u8` | `2` | -| [`proxy_secret_rotate_runtime`](#proxy_secret_rotate_runtime) | `bool` | `true` | -| [`me_secret_atomic_snapshot`](#me_secret_atomic_snapshot) | `bool` | `true` | -| [`proxy_secret_len_max`](#proxy_secret_len_max) | `usize` | `256` | -| [`me_pool_drain_ttl_secs`](#me_pool_drain_ttl_secs) | `u64` | `90` | -| [`me_instadrain`](#me_instadrain) | `bool` | `false` | -| [`me_pool_drain_threshold`](#me_pool_drain_threshold) | `u64` | `32` | -| [`me_pool_drain_soft_evict_enabled`](#me_pool_drain_soft_evict_enabled) | `bool` | `true` | -| [`me_pool_drain_soft_evict_grace_secs`](#me_pool_drain_soft_evict_grace_secs) | `u64` | `10` | -| [`me_pool_drain_soft_evict_per_writer`](#me_pool_drain_soft_evict_per_writer) | `u8` | `2` | -| [`me_pool_drain_soft_evict_budget_per_core`](#me_pool_drain_soft_evict_budget_per_core) | `u16` | `16` | -| [`me_pool_drain_soft_evict_cooldown_ms`](#me_pool_drain_soft_evict_cooldown_ms) | `u64` | `1000` | -| [`me_bind_stale_mode`](#me_bind_stale_mode) | `"never"`, `"ttl"`, or `"always"` | `"ttl"` | -| [`me_bind_stale_ttl_secs`](#me_bind_stale_ttl_secs) | `u64` | `90` | -| [`me_pool_min_fresh_ratio`](#me_pool_min_fresh_ratio) | `f32` | `0.8` | -| [`me_reinit_drain_timeout_secs`](#me_reinit_drain_timeout_secs) | `u64` | `90` | -| [`proxy_secret_auto_reload_secs`](#proxy_secret_auto_reload_secs) | `u64` | `3600` | -| [`proxy_config_auto_reload_secs`](#proxy_config_auto_reload_secs) | `u64` | `3600` | -| [`me_reinit_singleflight`](#me_reinit_singleflight) | `bool` | `true` | -| [`me_reinit_trigger_channel`](#me_reinit_trigger_channel) | `usize` | `64` | -| [`me_reinit_coalesce_window_ms`](#me_reinit_coalesce_window_ms) | `u64` | `200` | -| [`me_deterministic_writer_sort`](#me_deterministic_writer_sort) | `bool` | `true` | -| [`me_writer_pick_mode`](#me_writer_pick_mode) | `"sorted_rr"` or `"p2c"` | `"p2c"` | -| [`me_writer_pick_sample_size`](#me_writer_pick_sample_size) | `u8` | `3` | -| [`ntp_check`](#ntp_check) | `bool` | `true` | -| [`ntp_servers`](#ntp_servers) | `String[]` | `["pool.ntp.org"]` | -| [`auto_degradation_enabled`](#auto_degradation_enabled) | `bool` | `true` | -| [`degradation_min_unavailable_dc_groups`](#degradation_min_unavailable_dc_groups) | `u8` | `2` | -| [`rst_on_close`](#rst_on_close) | `"off"`, `"errors"`, or `"always"` | `"off"` | + | Key | Type | Default | Hot-Reload | | --- | ---- | ------- | ---------- | | [`data_path`](#data_path) | `String` | — | `✘` | @@ -2525,41 +2387,6 @@ Note: This section also accepts the legacy alias `[server.admin_api]` (same sche # [censorship] -| Key | Type | Default | -| --- | ---- | ------- | -| [`tls_domain`](#tls_domain) | `String` | `"petrovich.ru"` | -| [`tls_domains`](#tls_domains) | `String[]` | `[]` | -| [`unknown_sni_action`](#unknown_sni_action) | `"drop"`, `"mask"`, `"accept"`, `"reject_handshake"` | `"drop"` | -| [`tls_fetch_scope`](#tls_fetch_scope) | `String` | `""` | -| [`tls_fetch`](#tls_fetch) | `Table` | built-in defaults | -| [`mask`](#mask) | `bool` | `true` | -| [`mask_host`](#mask_host) | `String` | — | -| [`mask_port`](#mask_port) | `u16` | `443` | -| [`exclusive_mask`](#exclusive_mask) | `Map` | `{}` | -| [`mask_unix_sock`](#mask_unix_sock) | `String` | — | -| [`fake_cert_len`](#fake_cert_len) | `usize` | `2048` | -| [`tls_emulation`](#tls_emulation) | `bool` | `true` | -| [`tls_front_dir`](#tls_front_dir) | `String` | `"tlsfront"` | -| [`server_hello_delay_min_ms`](#server_hello_delay_min_ms) | `u64` | `0` | -| [`server_hello_delay_max_ms`](#server_hello_delay_max_ms) | `u64` | `0` | -| [`tls_new_session_tickets`](#tls_new_session_tickets) | `u8` | `0` | -| [`tls_full_cert_ttl_secs`](#tls_full_cert_ttl_secs) | `u64` | `90` | -| [`serverhello_compact`](#serverhello_compact) | `bool` | `false` | -| [`alpn_enforce`](#alpn_enforce) | `bool` | `true` | -| [`mask_proxy_protocol`](#mask_proxy_protocol) | `u8` | `0` | -| [`mask_shape_hardening`](#mask_shape_hardening) | `bool` | `true` | -| [`mask_shape_hardening_aggressive_mode`](#mask_shape_hardening_aggressive_mode) | `bool` | `false` | -| [`mask_shape_bucket_floor_bytes`](#mask_shape_bucket_floor_bytes) | `usize` | `512` | -| [`mask_shape_bucket_cap_bytes`](#mask_shape_bucket_cap_bytes) | `usize` | `4096` | -| [`mask_shape_above_cap_blur`](#mask_shape_above_cap_blur) | `bool` | `false` | -| [`mask_shape_above_cap_blur_max_bytes`](#mask_shape_above_cap_blur_max_bytes) | `usize` | `512` | -| [`mask_relay_max_bytes`](#mask_relay_max_bytes) | `usize` | `5242880` | -| [`mask_relay_timeout_ms`](#mask_relay_timeout_ms) | `u64` | `60_000` | -| [`mask_relay_idle_timeout_ms`](#mask_relay_idle_timeout_ms) | `u64` | `5_000` | -| [`mask_classifier_prefetch_timeout_ms`](#mask_classifier_prefetch_timeout_ms) | `u64` | `5` | -| [`mask_timing_normalization_enabled`](#mask_timing_normalization_enabled) | `bool` | `false` | -| [`mask_timing_normalization_floor_ms`](#mask_timing_normalization_floor_ms) | `u64` | `0` | -| [`mask_timing_normalization_ceiling_ms`](#mask_timing_normalization_ceiling_ms) | `u64` | `0` | | Key | Type | Default | Hot-Reload | | --- | ---- | ------- | ---------- | | [`tls_domain`](#tls_domain) | `String` | `"petrovich.ru"` | `✘` | diff --git a/docs/Config_params/CONFIG_PARAMS.ru.md b/docs/Config_params/CONFIG_PARAMS.ru.md index 28041e2..75c4cb0 100644 --- a/docs/Config_params/CONFIG_PARAMS.ru.md +++ b/docs/Config_params/CONFIG_PARAMS.ru.md @@ -85,145 +85,7 @@ # [general] -| Ключ | Тип | По умолчанию | -| --- | ---- | ------- | -| [`data_path`](#data_path) | `String` | — | -| [`prefer_ipv6`](#prefer_ipv6) | `bool` | `false` | -| [`fast_mode`](#fast_mode) | `bool` | `true` | -| [`use_middle_proxy`](#use_middle_proxy) | `bool` | `true` | -| [`proxy_secret_path`](#proxy_secret_path) | `String` | `"proxy-secret"` | -| [`proxy_config_v4_cache_path`](#proxy_config_v4_cache_path) | `String` | `"cache/proxy-config-v4.txt"` | -| [`proxy_config_v6_cache_path`](#proxy_config_v6_cache_path) | `String` | `"cache/proxy-config-v6.txt"` | -| [`ad_tag`](#ad_tag) | `String` | — | -| [`middle_proxy_nat_ip`](#middle_proxy_nat_ip) | `IpAddr` | — | -| [`middle_proxy_nat_probe`](#middle_proxy_nat_probe) | `bool` | `true` | -| [`middle_proxy_nat_stun`](#middle_proxy_nat_stun) | `String` | — | -| [`middle_proxy_nat_stun_servers`](#middle_proxy_nat_stun_servers) | `String[]` | `[]` | -| [`stun_nat_probe_concurrency`](#stun_nat_probe_concurrency) | `usize` | `8` | -| [`middle_proxy_pool_size`](#middle_proxy_pool_size) | `usize` | `8` | -| [`middle_proxy_warm_standby`](#middle_proxy_warm_standby) | `usize` | `16` | -| [`me_init_retry_attempts`](#me_init_retry_attempts) | `u32` | `0` | -| [`me2dc_fallback`](#me2dc_fallback) | `bool` | `true` | -| [`me2dc_fast`](#me2dc_fast) | `bool` | `true` | -| [`me_keepalive_enabled`](#me_keepalive_enabled) | `bool` | `true` | -| [`me_keepalive_interval_secs`](#me_keepalive_interval_secs) | `u64` | `8` | -| [`me_keepalive_jitter_secs`](#me_keepalive_jitter_secs) | `u64` | `2` | -| [`me_keepalive_payload_random`](#me_keepalive_payload_random) | `bool` | `true` | -| [`rpc_proxy_req_every`](#rpc_proxy_req_every) | `u64` | `0` | -| [`me_writer_cmd_channel_capacity`](#me_writer_cmd_channel_capacity) | `usize` | `4096` | -| [`me_route_channel_capacity`](#me_route_channel_capacity) | `usize` | `768` | -| [`me_c2me_channel_capacity`](#me_c2me_channel_capacity) | `usize` | `1024` | -| [`me_c2me_send_timeout_ms`](#me_c2me_send_timeout_ms) | `u64` | `4000` | -| [`me_reader_route_data_wait_ms`](#me_reader_route_data_wait_ms) | `u64` | `2` | -| [`me_d2c_flush_batch_max_frames`](#me_d2c_flush_batch_max_frames) | `usize` | `32` | -| [`me_d2c_flush_batch_max_bytes`](#me_d2c_flush_batch_max_bytes) | `usize` | `131072` | -| [`me_d2c_flush_batch_max_delay_us`](#me_d2c_flush_batch_max_delay_us) | `u64` | `500` | -| [`me_d2c_ack_flush_immediate`](#me_d2c_ack_flush_immediate) | `bool` | `true` | -| [`me_quota_soft_overshoot_bytes`](#me_quota_soft_overshoot_bytes) | `u64` | `65536` | -| [`me_d2c_frame_buf_shrink_threshold_bytes`](#me_d2c_frame_buf_shrink_threshold_bytes) | `usize` | `262144` | -| [`direct_relay_copy_buf_c2s_bytes`](#direct_relay_copy_buf_c2s_bytes) | `usize` | `65536` | -| [`direct_relay_copy_buf_s2c_bytes`](#direct_relay_copy_buf_s2c_bytes) | `usize` | `262144` | -| [`crypto_pending_buffer`](#crypto_pending_buffer) | `usize` | `262144` | -| [`max_client_frame`](#max_client_frame) | `usize` | `16777216` | -| [`desync_all_full`](#desync_all_full) | `bool` | `false` | -| [`beobachten`](#beobachten) | `bool` | `true` | -| [`beobachten_minutes`](#beobachten_minutes) | `u64` | `10` | -| [`beobachten_flush_secs`](#beobachten_flush_secs) | `u64` | `15` | -| [`beobachten_file`](#beobachten_file) | `String` | `"cache/beobachten.txt"` | -| [`hardswap`](#hardswap) | `bool` | `true` | -| [`me_warmup_stagger_enabled`](#me_warmup_stagger_enabled) | `bool` | `true` | -| [`me_warmup_step_delay_ms`](#me_warmup_step_delay_ms) | `u64` | `500` | -| [`me_warmup_step_jitter_ms`](#me_warmup_step_jitter_ms) | `u64` | `300` | -| [`me_reconnect_max_concurrent_per_dc`](#me_reconnect_max_concurrent_per_dc) | `u32` | `8` | -| [`me_reconnect_backoff_base_ms`](#me_reconnect_backoff_base_ms) | `u64` | `500` | -| [`me_reconnect_backoff_cap_ms`](#me_reconnect_backoff_cap_ms) | `u64` | `30000` | -| [`me_reconnect_fast_retry_count`](#me_reconnect_fast_retry_count) | `u32` | `16` | -| [`me_single_endpoint_shadow_writers`](#me_single_endpoint_shadow_writers) | `u8` | `2` | -| [`me_single_endpoint_outage_mode_enabled`](#me_single_endpoint_outage_mode_enabled) | `bool` | `true` | -| [`me_single_endpoint_outage_disable_quarantine`](#me_single_endpoint_outage_disable_quarantine) | `bool` | `true` | -| [`me_single_endpoint_outage_backoff_min_ms`](#me_single_endpoint_outage_backoff_min_ms) | `u64` | `250` | -| [`me_single_endpoint_outage_backoff_max_ms`](#me_single_endpoint_outage_backoff_max_ms) | `u64` | `3000` | -| [`me_single_endpoint_shadow_rotate_every_secs`](#me_single_endpoint_shadow_rotate_every_secs) | `u64` | `900` | -| [`me_floor_mode`](#me_floor_mode) | `"static"` or `"adaptive"` | `"adaptive"` | -| [`me_adaptive_floor_idle_secs`](#me_adaptive_floor_idle_secs) | `u64` | `90` | -| [`me_adaptive_floor_min_writers_single_endpoint`](#me_adaptive_floor_min_writers_single_endpoint) | `u8` | `1` | -| [`me_adaptive_floor_min_writers_multi_endpoint`](#me_adaptive_floor_min_writers_multi_endpoint) | `u8` | `1` | -| [`me_adaptive_floor_recover_grace_secs`](#me_adaptive_floor_recover_grace_secs) | `u64` | `180` | -| [`me_adaptive_floor_writers_per_core_total`](#me_adaptive_floor_writers_per_core_total) | `u16` | `48` | -| [`me_adaptive_floor_cpu_cores_override`](#me_adaptive_floor_cpu_cores_override) | `u16` | `0` | -| [`me_adaptive_floor_max_extra_writers_single_per_core`](#me_adaptive_floor_max_extra_writers_single_per_core) | `u16` | `1` | -| [`me_adaptive_floor_max_extra_writers_multi_per_core`](#me_adaptive_floor_max_extra_writers_multi_per_core) | `u16` | `2` | -| [`me_adaptive_floor_max_active_writers_per_core`](#me_adaptive_floor_max_active_writers_per_core) | `u16` | `64` | -| [`me_adaptive_floor_max_warm_writers_per_core`](#me_adaptive_floor_max_warm_writers_per_core) | `u16` | `64` | -| [`me_adaptive_floor_max_active_writers_global`](#me_adaptive_floor_max_active_writers_global) | `u32` | `256` | -| [`me_adaptive_floor_max_warm_writers_global`](#me_adaptive_floor_max_warm_writers_global) | `u32` | `256` | -| [`upstream_connect_retry_attempts`](#upstream_connect_retry_attempts) | `u32` | `2` | -| [`upstream_connect_retry_backoff_ms`](#upstream_connect_retry_backoff_ms) | `u64` | `100` | -| [`upstream_connect_budget_ms`](#upstream_connect_budget_ms) | `u64` | `3000` | -| [`upstream_unhealthy_fail_threshold`](#upstream_unhealthy_fail_threshold) | `u32` | `5` | -| [`upstream_connect_failfast_hard_errors`](#upstream_connect_failfast_hard_errors) | `bool` | `false` | -| [`stun_iface_mismatch_ignore`](#stun_iface_mismatch_ignore) | `bool` | `false` | -| [`unknown_dc_log_path`](#unknown_dc_log_path) | `String` | `"unknown-dc.txt"` | -| [`unknown_dc_file_log_enabled`](#unknown_dc_file_log_enabled) | `bool` | `false` | -| [`log_level`](#log_level) | `"debug"`, `"verbose"`, `"normal"`, or `"silent"` | `"normal"` | -| [`disable_colors`](#disable_colors) | `bool` | `false` | -| [`me_socks_kdf_policy`](#me_socks_kdf_policy) | `"strict"` or `"compat"` | `"strict"` | -| [`me_route_backpressure_enabled`](#me_route_backpressure_enabled) | `bool` | `false` | -| [`me_route_fairshare_enabled`](#me_route_fairshare_enabled) | `bool` | `false` | -| [`me_route_backpressure_base_timeout_ms`](#me_route_backpressure_base_timeout_ms) | `u64` | `25` | -| [`me_route_backpressure_high_timeout_ms`](#me_route_backpressure_high_timeout_ms) | `u64` | `120` | -| [`me_route_backpressure_high_watermark_pct`](#me_route_backpressure_high_watermark_pct) | `u8` | `80` | -| [`me_health_interval_ms_unhealthy`](#me_health_interval_ms_unhealthy) | `u64` | `1000` | -| [`me_health_interval_ms_healthy`](#me_health_interval_ms_healthy) | `u64` | `3000` | -| [`me_admission_poll_ms`](#me_admission_poll_ms) | `u64` | `1000` | -| [`me_warn_rate_limit_ms`](#me_warn_rate_limit_ms) | `u64` | `5000` | -| [`me_route_no_writer_mode`](#me_route_no_writer_mode) | `"async_recovery_failfast"`, `"inline_recovery_legacy"`, or `"hybrid_async_persistent"` | `"hybrid_async_persistent"` | -| [`me_route_no_writer_wait_ms`](#me_route_no_writer_wait_ms) | `u64` | `250` | -| [`me_route_hybrid_max_wait_ms`](#me_route_hybrid_max_wait_ms) | `u64` | `3000` | -| [`me_route_blocking_send_timeout_ms`](#me_route_blocking_send_timeout_ms) | `u64` | `250` | -| [`me_route_inline_recovery_attempts`](#me_route_inline_recovery_attempts) | `u32` | `3` | -| [`me_route_inline_recovery_wait_ms`](#me_route_inline_recovery_wait_ms) | `u64` | `3000` | -| [`fast_mode_min_tls_record`](#fast_mode_min_tls_record) | `usize` | `0` | -| [`update_every`](#update_every) | `u64` | `300` | -| [`me_reinit_every_secs`](#me_reinit_every_secs) | `u64` | `900` | -| [`me_hardswap_warmup_delay_min_ms`](#me_hardswap_warmup_delay_min_ms) | `u64` | `1000` | -| [`me_hardswap_warmup_delay_max_ms`](#me_hardswap_warmup_delay_max_ms) | `u64` | `2000` | -| [`me_hardswap_warmup_extra_passes`](#me_hardswap_warmup_extra_passes) | `u8` | `3` | -| [`me_hardswap_warmup_pass_backoff_base_ms`](#me_hardswap_warmup_pass_backoff_base_ms) | `u64` | `500` | -| [`me_config_stable_snapshots`](#me_config_stable_snapshots) | `u8` | `2` | -| [`me_config_apply_cooldown_secs`](#me_config_apply_cooldown_secs) | `u64` | `300` | -| [`me_snapshot_require_http_2xx`](#me_snapshot_require_http_2xx) | `bool` | `true` | -| [`me_snapshot_reject_empty_map`](#me_snapshot_reject_empty_map) | `bool` | `true` | -| [`me_snapshot_min_proxy_for_lines`](#me_snapshot_min_proxy_for_lines) | `u32` | `1` | -| [`proxy_secret_stable_snapshots`](#proxy_secret_stable_snapshots) | `u8` | `2` | -| [`proxy_secret_rotate_runtime`](#proxy_secret_rotate_runtime) | `bool` | `true` | -| [`me_secret_atomic_snapshot`](#me_secret_atomic_snapshot) | `bool` | `true` | -| [`proxy_secret_len_max`](#proxy_secret_len_max) | `usize` | `256` | -| [`me_pool_drain_ttl_secs`](#me_pool_drain_ttl_secs) | `u64` | `90` | -| [`me_instadrain`](#me_instadrain) | `bool` | `false` | -| [`me_pool_drain_threshold`](#me_pool_drain_threshold) | `u64` | `32` | -| [`me_pool_drain_soft_evict_enabled`](#me_pool_drain_soft_evict_enabled) | `bool` | `true` | -| [`me_pool_drain_soft_evict_grace_secs`](#me_pool_drain_soft_evict_grace_secs) | `u64` | `10` | -| [`me_pool_drain_soft_evict_per_writer`](#me_pool_drain_soft_evict_per_writer) | `u8` | `2` | -| [`me_pool_drain_soft_evict_budget_per_core`](#me_pool_drain_soft_evict_budget_per_core) | `u16` | `16` | -| [`me_pool_drain_soft_evict_cooldown_ms`](#me_pool_drain_soft_evict_cooldown_ms) | `u64` | `1000` | -| [`me_bind_stale_mode`](#me_bind_stale_mode) | `"never"`, `"ttl"`, or `"always"` | `"ttl"` | -| [`me_bind_stale_ttl_secs`](#me_bind_stale_ttl_secs) | `u64` | `90` | -| [`me_pool_min_fresh_ratio`](#me_pool_min_fresh_ratio) | `f32` | `0.8` | -| [`me_reinit_drain_timeout_secs`](#me_reinit_drain_timeout_secs) | `u64` | `90` | -| [`proxy_secret_auto_reload_secs`](#proxy_secret_auto_reload_secs) | `u64` | `3600` | -| [`proxy_config_auto_reload_secs`](#proxy_config_auto_reload_secs) | `u64` | `3600` | -| [`me_reinit_singleflight`](#me_reinit_singleflight) | `bool` | `true` | -| [`me_reinit_trigger_channel`](#me_reinit_trigger_channel) | `usize` | `64` | -| [`me_reinit_coalesce_window_ms`](#me_reinit_coalesce_window_ms) | `u64` | `200` | -| [`me_deterministic_writer_sort`](#me_deterministic_writer_sort) | `bool` | `true` | -| [`me_writer_pick_mode`](#me_writer_pick_mode) | `"sorted_rr"` or `"p2c"` | `"p2c"` | -| [`me_writer_pick_sample_size`](#me_writer_pick_sample_size) | `u8` | `3` | -| [`ntp_check`](#ntp_check) | `bool` | `true` | -| [`ntp_servers`](#ntp_servers) | `String[]` | `["pool.ntp.org"]` | -| [`auto_degradation_enabled`](#auto_degradation_enabled) | `bool` | `true` | -| [`degradation_min_unavailable_dc_groups`](#degradation_min_unavailable_dc_groups) | `u8` | `2` | -| [`rst_on_close`](#rst_on_close) | `"off"`, `"errors"` или `"always"` | `"off"` | + | Ключ | Тип | По умолчанию | Hot-Reload | | --- | ---- | ------- | ---------- | | [`data_path`](#data_path) | `String` | — | `✘` | @@ -2531,41 +2393,6 @@ # [censorship] -| Ключ | Тип | По умолчанию | -| --- | ---- | ------- | -| [`tls_domain`](#tls_domain) | `String` | `"petrovich.ru"` | -| [`tls_domains`](#tls_domains) | `String[]` | `[]` | -| [`unknown_sni_action`](#unknown_sni_action) | `"drop"`, `"mask"`, `"accept"`, `"reject_handshake"` | `"drop"` | -| [`tls_fetch_scope`](#tls_fetch_scope) | `String` | `""` | -| [`tls_fetch`](#tls_fetch) | `Table` | built-in defaults | -| [`mask`](#mask) | `bool` | `true` | -| [`mask_host`](#mask_host) | `String` | — | -| [`mask_port`](#mask_port) | `u16` | `443` | -| [`exclusive_mask`](#exclusive_mask) | `Map` | `{}` | -| [`mask_unix_sock`](#mask_unix_sock) | `String` | — | -| [`fake_cert_len`](#fake_cert_len) | `usize` | `2048` | -| [`tls_emulation`](#tls_emulation) | `bool` | `true` | -| [`tls_front_dir`](#tls_front_dir) | `String` | `"tlsfront"` | -| [`server_hello_delay_min_ms`](#server_hello_delay_min_ms) | `u64` | `0` | -| [`server_hello_delay_max_ms`](#server_hello_delay_max_ms) | `u64` | `0` | -| [`tls_new_session_tickets`](#tls_new_session_tickets) | `u8` | `0` | -| [`tls_full_cert_ttl_secs`](#tls_full_cert_ttl_secs) | `u64` | `90` | -| [`serverhello_compact`](#serverhello_compact) | `bool` | `false` | -| [`alpn_enforce`](#alpn_enforce) | `bool` | `true` | -| [`mask_proxy_protocol`](#mask_proxy_protocol) | `u8` | `0` | -| [`mask_shape_hardening`](#mask_shape_hardening) | `bool` | `true` | -| [`mask_shape_hardening_aggressive_mode`](#mask_shape_hardening_aggressive_mode) | `bool` | `false` | -| [`mask_shape_bucket_floor_bytes`](#mask_shape_bucket_floor_bytes) | `usize` | `512` | -| [`mask_shape_bucket_cap_bytes`](#mask_shape_bucket_cap_bytes) | `usize` | `4096` | -| [`mask_shape_above_cap_blur`](#mask_shape_above_cap_blur) | `bool` | `false` | -| [`mask_shape_above_cap_blur_max_bytes`](#mask_shape_above_cap_blur_max_bytes) | `usize` | `512` | -| [`mask_relay_max_bytes`](#mask_relay_max_bytes) | `usize` | `5242880` | -| [`mask_relay_timeout_ms`](mask_relay_timeout_ms) | `u64` | `60_000` | -| [`mask_relay_idle_timeout_ms`](mask_relay_idle_timeout_ms) | `u64` | `5_000` | -| [`mask_classifier_prefetch_timeout_ms`](#mask_classifier_prefetch_timeout_ms) | `u64` | `5` | -| [`mask_timing_normalization_enabled`](#mask_timing_normalization_enabled) | `bool` | `false` | -| [`mask_timing_normalization_floor_ms`](#mask_timing_normalization_floor_ms) | `u64` | `0` | -| [`mask_timing_normalization_ceiling_ms`](#mask_timing_normalization_ceiling_ms) | `u64` | `0` | | Ключ | Тип | По умолчанию | Hot-Reload | | --- | ---- | ------- | ---------- | | [`tls_domain`](#tls_domain) | `String` | `"petrovich.ru"` | `✘` | diff --git a/docs/FAQ.en.md b/docs/FAQ.en.md index 0e55c1f..3086283 100644 --- a/docs/FAQ.en.md +++ b/docs/FAQ.en.md @@ -172,7 +172,7 @@ Those cross-DC requests are normal and happen constantly. > If your home DC is DC2 and DC2 goes down, you **cannot** reach DC5 even though DC5 itself is perfectly healthy. > The client has no valid session to route the request through. -This is also why an MTProxy only needs to reach Telegram's DC infrastructure as a whole. +This is also why it is required for MTProxy to reach Telegram's DC infrastructure as a whole. The proxy itself doesn't care which DC your account lives on. The client negotiates the correct DC through the proxy after connecting. ### How many people can use one link diff --git a/docs/FAQ.ru.md b/docs/FAQ.ru.md index 9b1ec52..0deac1f 100644 --- a/docs/FAQ.ru.md +++ b/docs/FAQ.ru.md @@ -157,7 +157,7 @@ https://github.com/telemt/telemt/discussions/167 ## Как клиенты взаимодействуют с дата-центрами Telegram При регистрации аккаунта Telegram он навсегда привязывается к одному из дата-центров (DC). -Telegram заранее определяет к какому DC привязать аккаунт исходя из региона, к которому относиться номер телефона. +Telegram заранее определяет к какому DC привязать аккаунт исходя из региона, к которому относится номер телефона. Этот DC становится вашим **домашним**: именно там хранится весь контент, который вы загружаете (фото, видео, файлы, сообщения). И именно на нем клиент авторизуется при каждом подключении. @@ -170,7 +170,7 @@ Telegram заранее определяет к какому DC привязат > Если ваш домашний DC — DC2, и DC2 лежит, вы **не сможете** достучаться и до DC5, даже если сам DC5 полностью исправен. > У клиента просто нет валидной сессии, через которую можно было бы направить запрос. -По той же причине MTProxy достаточно иметь доступ к инфраструктуре Telegram в целом. +По той же причине MTProxy необходимо иметь доступ к инфраструктуре Telegram целиком, а не частично. Cамому MTProxy всё равно, на каком DC живёт ваш аккаунт. Клиент cам договаривается о нужном DC через прокси уже после подключения. ## Что такое dd и ee в контексте MTProxy? diff --git a/install.sh b/install.sh index 78c0678..955c73d 100644 --- a/install.sh +++ b/install.sh @@ -84,21 +84,22 @@ set_language() { L_INFO_KEEP_CONF="Примечание: Конфигурация сохранена. Используйте 'purge' для очистки." L_INFO_I_START="Начинается установка" L_I_STAGE_1=">>> Этап 1: Проверка окружения и зависимостей" - L_I_STAGE_1_5=">>> Этап 1.5: Интерактивная настройка" + L_I_STAGE_2=">>> Этап 2: Интерактивная настройка" L_I_PROMPT_DOM="\nПожалуйста, укажите домен TLS\nНажмите Enter, чтобы оставить по умолчанию [%s]: " + L_I_PROMPT_PORT="\nПожалуйста, укажите порт сервера\nНажмите Enter, чтобы оставить по умолчанию [%s]: " L_WARN_NO_TTY="Интерактивный режим недоступен (нет TTY). Используется:" - L_I_STAGE_2=">>> Этап 2: Загрузка архива" + L_I_STAGE_3=">>> Этап 3: Загрузка архива" L_ERR_TMP_DIR="Не удалось создать временную директорию" L_ERR_TMP_INV="Временная директория недействительна" L_INFO_FALLBACK="Сборка x86_64-v3 не найдена, откат к стандартной x86_64..." L_ERR_DL_FAIL="Ошибка загрузки архива" - L_I_STAGE_3=">>> Этап 3: Распаковка архива" + L_I_STAGE_4=">>> Этап 4: Распаковка архива" L_ERR_EXTRACT="Ошибка распаковки архива." L_ERR_BIN_NOT_FOUND="Бинарный файл не найден в архиве" - L_I_STAGE_4=">>> Этап 4: Настройка окружения (Юзер, Группа, Папки)" - L_I_STAGE_5=">>> Этап 5: Установка бинарного файла" - L_I_STAGE_6=">>> Этап 6: Генерация/Обновление конфигурации" - L_I_STAGE_7=">>> Этап 7: Установка и запуск службы" + L_I_STAGE_5=">>> Этап 5: Настройка окружения (Юзер, Группа, Папки)" + L_I_STAGE_6=">>> Этап 6: Установка бинарного файла" + L_I_STAGE_7=">>> Этап 7: Генерация/Обновление конфигурации" + L_I_STAGE_8=">>> Этап 8: Установка и запуск службы" L_OUT_WARN_H="УСТАНОВКА ЗАВЕРШЕНА С ПРЕДУПРЕЖДЕНИЯМИ" L_OUT_WARN_D="Служба установлена, но не запустилась.\nПожалуйста, проверьте логи.\n" L_OUT_SUCC_H="УСТАНОВКА УСПЕШНО ЗАВЕРШЕНА" @@ -160,21 +161,22 @@ set_language() { L_INFO_KEEP_CONF="Note: Configuration kept. Run with 'purge' to remove completely." L_INFO_I_START="Starting installation of" L_I_STAGE_1=">>> Stage 1: Verifying environment and dependencies" - L_I_STAGE_1_5=">>> Stage 1.5: Interactive Setup" + L_I_STAGE_2=">>> Stage 2: Interactive Setup" L_I_PROMPT_DOM="\nPlease specify the TLS Domain\nPress Enter to keep default [%s]: " + L_I_PROMPT_PORT="\nPlease specify the Server Port\nPress Enter to keep default [%s]: " L_WARN_NO_TTY="Interactive mode unavailable (no TTY). Using:" - L_I_STAGE_2=">>> Stage 2: Downloading archive" + L_I_STAGE_3=">>> Stage 3: Downloading archive" L_ERR_TMP_DIR="Temp directory creation failed" L_ERR_TMP_INV="Temp directory is invalid or was not created" L_INFO_FALLBACK="x86_64-v3 build not found, falling back to standard x86_64..." L_ERR_DL_FAIL="Download failed" - L_I_STAGE_3=">>> Stage 3: Extracting archive" + L_I_STAGE_4=">>> Stage 4: Extracting archive" L_ERR_EXTRACT="Extraction failed." L_ERR_BIN_NOT_FOUND="Binary not found in archive" - L_I_STAGE_4=">>> Stage 4: Setting up environment (User, Group, Directories)" - L_I_STAGE_5=">>> Stage 5: Installing binary" - L_I_STAGE_6=">>> Stage 6: Generating/Updating configuration" - L_I_STAGE_7=">>> Stage 7: Installing and starting service" + L_I_STAGE_5=">>> Stage 5: Setting up environment (User, Group, Directories)" + L_I_STAGE_6=">>> Stage 6: Installing binary" + L_I_STAGE_7=">>> Stage 7: Generating/Updating configuration" + L_I_STAGE_8=">>> Stage 8: Installing and starting service" L_OUT_WARN_H="INSTALLATION COMPLETED WITH WARNINGS" L_OUT_WARN_D="The service was installed but failed to start.\nPlease check the logs to determine the issue.\n" L_OUT_SUCC_H="INSTALLATION SUCCESS" @@ -269,7 +271,10 @@ say() { if [ "$#" -eq 0 ] || [ -z "${1:-}" ]; then printf '\n' else - printf '[INFO] %s\n' "$*" + case "$*" in + \[*\]*) printf '%s\n' "$*" ;; + *) printf '[INFO] %s\n' "$*" ;; + esac fi } die() { printf '[ERROR] %s\n' "$*" >&2; exit 1; } @@ -527,9 +532,9 @@ setup_dirs() { stop_service() { svc="$(get_svc_mgr)" - if [ "$svc" = "systemd" ] && systemctl is-active --quiet "$SERVICE_NAME" 2>/dev/null; then + if [ "$svc" = "systemd" ] && $SUDO systemctl is-active --quiet "$SERVICE_NAME" 2>/dev/null; then $SUDO systemctl stop "$SERVICE_NAME" 2>/dev/null || true - elif [ "$svc" = "openrc" ] && rc-service "$SERVICE_NAME" status >/dev/null 2>&1; then + elif [ "$svc" = "openrc" ] && $SUDO rc-service "$SERVICE_NAME" status >/dev/null 2>&1; then $SUDO rc-service "$SERVICE_NAME" stop 2>/dev/null || true fi } @@ -832,10 +837,36 @@ case "$ACTION" in fi fi - check_port_availability + if [ "$PORT_PROVIDED" -eq 0 ] || [ "$DOMAIN_PROVIDED" -eq 0 ]; then + say "$L_I_STAGE_2" + fi + + if [ "$PORT_PROVIDED" -eq 0 ]; then + if [ -t 0 ] || [ -c /dev/tty ]; then + while true; do + printf "$L_I_PROMPT_PORT" "$SERVER_PORT" + read -r input_port &2; continue ;; + esac + port_num="$(printf '%s\n' "$input_port" | sed 's/^0*//')" + [ -z "$port_num" ] && port_num="0" + if [ "${#port_num}" -gt 5 ] || [ "$port_num" -lt 1 ] || [ "$port_num" -gt 65535 ]; then + printf '[ERROR] %s\n' "$L_ERR_PORT_RANGE" >&2; continue + fi + SERVER_PORT="$port_num" + break + done + else + say "[WARNING] $L_WARN_NO_TTY $SERVER_PORT" + fi + PORT_PROVIDED=1 + fi if [ "$DOMAIN_PROVIDED" -eq 0 ]; then - say "$L_I_STAGE_1_5" if [ -t 0 ] || [ -c /dev/tty ]; then printf "$L_I_PROMPT_DOM" "$TLS_DOMAIN" read -r input_domain /dev/null; then die "$L_ERR_EXTRACT" fi @@ -891,16 +924,16 @@ case "$ACTION" in EXTRACTED_BIN="$(find "$TEMP_DIR" -type f -name "$BIN_NAME" -print 2>/dev/null | head -n 1 || true)" [ -n "$EXTRACTED_BIN" ] || die "$L_ERR_BIN_NOT_FOUND" - say "$L_I_STAGE_4" + say "$L_I_STAGE_5" ensure_user_group; setup_dirs; stop_service - say "$L_I_STAGE_5" + say "$L_I_STAGE_6" install_binary "$EXTRACTED_BIN" "${INSTALL_DIR}/${BIN_NAME}" - say "$L_I_STAGE_6" + say "$L_I_STAGE_7" install_config - say "$L_I_STAGE_7" + say "$L_I_STAGE_8" install_service if [ "${SERVICE_START_FAILED:-0}" -eq 1 ]; then