diff --git a/README.MD b/README.MD index 3499e5e..cbedc35 100644 --- a/README.MD +++ b/README.MD @@ -72,11 +72,17 @@ Nginx 目录: `/etc/nginx` https://bandwagonhost.com/aff.php?aff=63939 -支持通过 Telegram MugglePay 接受虚拟货币捐赠。 +您可以使用我的 justmysocks AFF 购买搬瓦工提供的代理 + +https://justmysocks.net/members/aff.php?aff=17621 + +通过 Telegram MugglePay 进行虚拟货币捐赠。 发送 `/pay @wulabing xxx` 到 @MugglePayBot 即可,默认货币为 USDT。 -如需要通过支付宝/微信捐赠,请在 Telegram 私聊 [@wulabing](https://t.me/wulabing),感谢您的支持! +通过 zfaka 进行 支付宝/微信捐赠 + +https://zfaka.wulabing.com ## Stargazers over time diff --git a/config/web.conf b/config/web.conf index d84dcce..8fa2ee1 100644 --- a/config/web.conf +++ b/config/web.conf @@ -1,14 +1,3 @@ -server -{ - listen 80; - listen [::]:80; - server_name xxx; - return 301 https://$http_host$request_uri; - - access_log /dev/null; - error_log /dev/null; -} - server { listen 127.0.0.1:60000 proxy_protocol; @@ -30,3 +19,13 @@ server error_log off; } } +server +{ + listen 80; + listen [::]:80; + server_name xxx; + return 301 https://$http_host$request_uri; + + access_log /dev/null; + error_log /dev/null; +} \ No newline at end of file diff --git a/install.sh b/install.sh index 6c85e3e..6fb4121 100644 --- a/install.sh +++ b/install.sh @@ -27,7 +27,7 @@ OK="${Green}[OK]${Font}" ERROR="${Red}[ERROR]${Font}" # 变量 -shell_version="1.2.8" +shell_version="1.2.9" github_branch="main" xray_conf_dir="/usr/local/etc/xray" website_dir="/www/xray_web/" @@ -175,9 +175,9 @@ function dependency_install() { # judge "编译工具包 安装" if [[ "${ID}" == "centos" ]]; then - ${INS} pcre pcre-devel zlib-devel epel-release openssl openssl-devel + ${INS} pcre pcre-devel zlib-devel epel-release openssl openssl-devel iputils else - ${INS} libpcre3 libpcre3-dev zlib1g-dev openssl libssl-dev + ${INS} libpcre3 libpcre3-dev zlib1g-dev openssl libssl-dev iputils-ping fi ${INS} jq @@ -381,7 +381,7 @@ function ssl_install() { function acme() { - sed -i "6s/^/#/" "$nginx_conf" + sed -i "27s/^/#/" "$nginx_conf" # 启动 Nginx Xray 并使用 Nginx 配合 acme 进行证书签发 systemctl restart nginx @@ -400,7 +400,7 @@ function acme() { exit 1 fi - sed -i "6s/#//" "$nginx_conf" + sed -i "27s/#//" "$nginx_conf" } function ssl_judge_and_install() { @@ -646,6 +646,7 @@ menu() { echo -e "${Green}33.${Font} 卸载 Xray" echo -e "${Green}34.${Font} 更新 Xray-core" echo -e "${Green}35.${Font} 安装 Xray-core 测试版(Pre)" + echo -e "${Green}36.${Font} 手动更新SSL证书" echo -e "${Green}40.${Font} 退出" read -rp "请输入数字:" menu_num case $menu_num in @@ -720,6 +721,10 @@ menu() { bash -c "$(curl -L https://github.com/XTLS/Xray-install/raw/main/install-release.sh)" - install --beta restart_all ;; + 36) + acme.sh --cron + restart_all + ;; 40) exit 0 ;;