refactor: разделил AMNEZIA_SERVER и KILL_SWITCH_EXCEPTIONS
- AMNEZIA_SERVER — только IP/домены серверов Amnezia (для поднятия VPN) - KILL_SWITCH_EXCEPTIONS — дополнительные исключения (git, etc.) - Обе переменные поддерживают IP и домены (DNS-резолвинг) - setup.sh: раздельные промпты в меню Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
11
setup.sh
11
setup.sh
@@ -94,11 +94,13 @@ case "$choice" in
|
||||
auto_dev="${auto_dev:-wlp1s0}"
|
||||
saved_local_dns=""
|
||||
saved_amn_srv=""
|
||||
saved_ks_exc=""
|
||||
if [ -f "$net_conf" ]; then
|
||||
saved_gw=$(grep '^GATEWAY=' "$net_conf" | cut -d= -f2)
|
||||
saved_dev=$(grep '^DEV=' "$net_conf" | cut -d= -f2)
|
||||
saved_local_dns=$(grep '^LOCAL_DNS=' "$net_conf" | cut -d= -f2)
|
||||
saved_amn_srv=$(grep '^AMNEZIA_SERVER=' "$net_conf" | cut -d= -f2)
|
||||
saved_ks_exc=$(grep '^KS_EXCEPTIONS=' "$net_conf" | cut -d= -f2)
|
||||
auto_gw="${saved_gw:-$auto_gw}"
|
||||
auto_dev="${saved_dev:-$auto_dev}"
|
||||
echo -e "Загружены параметры профиля ${BLD}${chosen_profile}${CLR}: GATEWAY=${BLD}${auto_gw}${CLR} DEV=${BLD}${auto_dev}${CLR}"
|
||||
@@ -110,16 +112,19 @@ case "$choice" in
|
||||
read -rp "GATEWAY (IP роутера) [${auto_gw}]: " gw
|
||||
read -rp "DEV (интерфейс) [${auto_dev}]: " dev
|
||||
read -rp "LOCAL_DNS (DNS для *.loc) [${saved_local_dns:-пусто}]: " local_dns
|
||||
read -rp "AMNEZIA_SERVER (IP сервера Amnezia) [${saved_amn_srv:-пусто}]: " amn_srv
|
||||
read -rp "AMNEZIA_SERVER (IP/домен сервера Amnezia) [${saved_amn_srv:-пусто}]: " amn_srv
|
||||
read -rp "KS_EXCEPTIONS (исключения kill switch: IP/домены через пробел) [${saved_ks_exc:-пусто}]: " ks_exc
|
||||
gw="${gw:-$auto_gw}"
|
||||
dev="${dev:-$auto_dev}"
|
||||
[ "$local_dns" = "пусто" ] && local_dns=""
|
||||
local_dns="${local_dns:-$saved_local_dns}"
|
||||
[ "$amn_srv" = "пусто" ] && amn_srv=""
|
||||
amn_srv="${amn_srv:-$saved_amn_srv}"
|
||||
printf 'GATEWAY=%s\nDEV=%s\nLOCAL_DNS=%s\nAMNEZIA_SERVER=%s\n' "$gw" "$dev" "$local_dns" "$amn_srv" > "$net_conf"
|
||||
[ "$ks_exc" = "пусто" ] && ks_exc=""
|
||||
ks_exc="${ks_exc:-$saved_ks_exc}"
|
||||
printf 'GATEWAY=%s\nDEV=%s\nLOCAL_DNS=%s\nAMNEZIA_SERVER=%s\nKILL_SWITCH_EXCEPTIONS=%s\n' "$gw" "$dev" "$local_dns" "$amn_srv" "$ks_exc" > "$net_conf"
|
||||
echo ""
|
||||
sudo GATEWAY="$gw" DEV="$dev" LOCAL_DNS="$local_dns" AMNEZIA_SERVER="$amn_srv" USER_HOME="$HOME" bash scripts/ru-bypass.sh
|
||||
sudo GATEWAY="$gw" DEV="$dev" LOCAL_DNS="$local_dns" AMNEZIA_SERVER="$amn_srv" KILL_SWITCH_EXCEPTIONS="$ks_exc" USER_HOME="$HOME" bash scripts/ru-bypass.sh
|
||||
;;
|
||||
3)
|
||||
echo -e "${YEL}Перед этим выйди из Claude Code — сессия сменит IP.${CLR}"
|
||||
|
||||
Reference in New Issue
Block a user