From 3f6d0eca55b664de5f5abf3527a651c7ca239839 Mon Sep 17 00:00:00 2001 From: kzolotarev95 Date: Mon, 17 Aug 2026 23:41:45 +0400 Subject: [PATCH] Fix automatic HTTPS bootstrap during VPS install --- vps/enable-https.sh | 105 ++++++++++++++++++++++++++++++++++++-------- vps/install-vps.sh | 17 ++++--- 2 files changed, 96 insertions(+), 26 deletions(-) diff --git a/vps/enable-https.sh b/vps/enable-https.sh index a49e58f..7c5d911 100755 --- a/vps/enable-https.sh +++ b/vps/enable-https.sh @@ -28,6 +28,13 @@ die() { exit 1 } +apt_get() { + if ! command -v apt-get >/dev/null 2>&1; then + die "нужен Ubuntu/Debian с apt-get" + fi + $SUDO apt-get -o DPkg::Lock::Timeout=300 "$@" +} + detect_host() { if [ -n "$HOSTNAME_ARG" ]; then printf '%s\n' "$HOSTNAME_ARG" @@ -53,12 +60,8 @@ install_certbot() { fi info "Ставлю свежий Certbot через snap..." - if command -v apt-get >/dev/null 2>&1; then - $SUDO apt-get update - $SUDO apt-get install -y snapd - else - die "нужен Ubuntu/Debian с apt-get или уже установленный certbot с --ip-address" - fi + apt_get update + apt_get install -y snapd $SUDO systemctl enable --now snapd.socket >/dev/null 2>&1 || true $SUDO snap wait system seed.loaded >/dev/null 2>&1 || true @@ -75,11 +78,8 @@ install_certbot() { } install_nginx() { - if ! command -v apt-get >/dev/null 2>&1; then - die "для HTTPS-прокси нужен Ubuntu/Debian с apt-get" - fi info "Ставлю nginx для стабильного HTTPS..." - $SUDO apt-get update + apt_get update policy_created=0 if [ ! -e /usr/sbin/policy-rc.d ]; then $SUDO tee /usr/sbin/policy-rc.d >/dev/null <<'EOF' @@ -89,7 +89,7 @@ EOF $SUDO chmod +x /usr/sbin/policy-rc.d policy_created=1 fi - if ! $SUDO apt-get install -y nginx; then + if ! apt_get install -y nginx; then if [ "$policy_created" = "1" ]; then $SUDO rm -f /usr/sbin/policy-rc.d fi @@ -102,6 +102,56 @@ EOF $SUDO systemctl stop nginx >/dev/null 2>&1 || true } +write_nginx_http_bootstrap_config() { + host="$1" + $SUDO mkdir -p /etc/nginx/conf.d /etc/nginx/sites-available /etc/nginx/sites-enabled + $SUDO tee /etc/nginx/conf.d/owrt-remote-map.conf >/dev/null <<'EOF' +map $http_upgrade $owrt_remote_connection_upgrade { + default upgrade; + '' close; +} +EOF + $SUDO tee /etc/nginx/sites-available/owrt-remote >/dev/null </dev/null + i=1 + while [ "$i" -le 20 ]; do + if [ "$(curl -fsS --max-time 3 "http://127.0.0.1/.well-known/acme-challenge/$token" 2>/dev/null || true)" = "$token" ]; then + $SUDO rm -f "$probe_path" + return 0 + fi + sleep 1 + i=$((i + 1)) + done + $SUDO rm -f "$probe_path" + return 1 +} + certbot_email_args() { if [ -n "$EMAIL" ]; then printf '%s\n' "-m $EMAIL" @@ -188,16 +257,10 @@ Environment=OWRT_REMOTE_TLS_PORTS= EOF $SUDO mkdir -p /etc/nginx/conf.d /etc/nginx/sites-available /etc/nginx/sites-enabled - $SUDO tee /etc/nginx/conf.d/owrt-remote-map.conf >/dev/null <<'EOF' -map $http_upgrade $owrt_remote_connection_upgrade { - default upgrade; - '' close; -} -EOF $SUDO tee /etc/nginx/sites-available/owrt-remote >/dev/null </dev/null 2>&1; then + die "поддерживается Ubuntu/Debian с apt-get" + fi + $SUDO apt-get -o DPkg::Lock::Timeout=300 "$@" +} + need_cmd() { command -v "$1" >/dev/null 2>&1 || die "не найдена команда: $1" } @@ -77,12 +84,8 @@ detect_vps_host() { } install_packages() { - if command -v apt-get >/dev/null 2>&1; then - $SUDO apt-get update - $SUDO apt-get install -y curl wget unzip python3 python3-venv openssh-client ca-certificates ufw - return - fi - die "поддерживается Ubuntu/Debian с apt-get" + apt_get update + apt_get install -y curl wget unzip python3 python3-venv openssh-client ca-certificates ufw } install_xray_binary() {