diff --git a/awg2-harness.service b/awg2-harness.service index 709872e..200b80e 100644 --- a/awg2-harness.service +++ b/awg2-harness.service @@ -3,6 +3,8 @@ Description=AWG2 Harness multi-orchestrator After=network-online.target docker.service Wants=network-online.target Requires=docker.service +StartLimitIntervalSec=60 +StartLimitBurst=5 [Service] Type=simple @@ -10,7 +12,7 @@ User=root ExecStartPre=/usr/sbin/awg2-harness --config /etc/awg2-harness/config.toml ensure-swap ExecStart=/usr/sbin/awg2-harness --config /etc/awg2-harness/config.toml daemon Restart=always -RestartSec=5 +RestartSec=10 StandardOutput=journal StandardError=journal diff --git a/config.example.toml b/config.example.toml index 7ad375c..ff7c560 100644 --- a/config.example.toml +++ b/config.example.toml @@ -6,8 +6,8 @@ peer_ipv4_cidr = "10.8.1.0/24" [traffic] enabled = true -peer_limit = "70mbit" -root_rate = "1000mbit" +peer_limit = "50mbit" +root_rate = "500mbit" reconcile_interval_secs = 15 container_ready_timeout_secs = 120 class_start_id = 10 @@ -23,7 +23,7 @@ default_input_policy = "drop" [anti_torrent] enabled = true -max_connections_per_peer = 100 +max_connections_per_peer = 150 peer_ipv4_cidr = "10.8.1.0/24" apply_in_amnezia_netns = true diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index 235bdff..e912ee0 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -13,8 +13,8 @@ peer_ipv4_cidr = "10.8.1.0/24" [traffic] enabled = true -peer_limit = "70mbit" -root_rate = "1000mbit" +peer_limit = "50mbit" +root_rate = "500mbit" reconcile_interval_secs = 15 container_ready_timeout_secs = 120 class_start_id = 10 @@ -57,9 +57,9 @@ swappiness = 1 `amnezia.peer_ipv4_cidr` — подсеть VPN peers. Сейчас старая bash-система жёстко ищет `10.8.1.x`; в Rust это должно быть конфигурируемо. -`traffic.peer_limit` — per-peer лимит в обе стороны. Текущий production default — `70mbit`. +`traffic.peer_limit` — per-peer лимит в обе стороны. Текущий production default — `50mbit`. -`traffic.root_rate` — верхний HTB-класс, в старой системе `1000mbit`. +`traffic.root_rate` — верхний HTB-класс, в текущем production default — `500mbit`. Историческое значение old bash — `1000mbit`. `traffic.reconcile_interval_secs` — период фоновой проверки. Он нужен не вместо Docker events, а вместе с ними. diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index 0869e7a..8be8c70 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -182,8 +182,8 @@ peer_ipv4_cidr = "10.8.1.0/24" [traffic] enabled = true -peer_limit = "70mbit" -root_rate = "1000mbit" +peer_limit = "50mbit" +root_rate = "500mbit" reconcile_interval_secs = 15 container_ready_timeout_secs = 120 class_start_id = 10 @@ -238,6 +238,8 @@ Description=AWG2 Harness multi-orchestrator After=network-online.target docker.service Wants=network-online.target Requires=docker.service +StartLimitIntervalSec=60 +StartLimitBurst=5 [Service] Type=simple @@ -245,7 +247,7 @@ User=root ExecStartPre=/usr/sbin/awg2-harness --config /etc/awg2-harness/config.toml ensure-swap ExecStart=/usr/sbin/awg2-harness --config /etc/awg2-harness/config.toml daemon Restart=always -RestartSec=5 +RestartSec=10 StandardOutput=journal StandardError=journal diff --git a/traffic_core/Cargo.toml b/traffic_core/Cargo.toml index 2597092..41f5609 100644 --- a/traffic_core/Cargo.toml +++ b/traffic_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "awg2-harness" -version = "0.1.0" +version = "0.1.4" edition = "2024" [dependencies]