diff --git a/app/bot.php b/app/bot.php index 1cce221..6e2a22f 100644 --- a/app/bot.php +++ b/app/bot.php @@ -4199,10 +4199,6 @@ DNS-over-HTTPS with IP: ], ], [ - [ - 'text' => $this->i18n('sh_title'), - 'callback_data' => "/menu ss", - ], [ 'text' => $this->i18n('warp') . ': ' . $this->warpStatus(), 'callback_data' => "/warp", diff --git a/app/service.php b/app/service.php index 58e00a4..63e9cc1 100644 --- a/app/service.php +++ b/app/service.php @@ -13,7 +13,6 @@ if ($c['debug']) { $bot = new Bot($c['key'], $i); $bot->selfUpdate(); -$bot->ssPswdCheck(); $bot->restartTG(); if (!empty($bot->selfupdate)) { $bot->offWarp(); diff --git a/config/nginx.conf b/config/nginx.conf index ae6f1d0..156be81 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -56,16 +56,6 @@ http { access_log /logs/nginx_tlgrm_access; proxy_pass http://php; } - location /v2ray { - access_log /logs/nginx_v2ray_access; - proxy_redirect off; - proxy_buffering off; - proxy_http_version 1.1; - proxy_pass http://ss:8388/; - proxy_set_header Host $http_host; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } location /ws { proxy_pass http://xr:443; proxy_redirect off; @@ -149,16 +139,6 @@ http { # root /certs/; # try_files $uri =404; # } - # location /v2ray { - # access_log /logs/nginx_v2ray_access; - # proxy_redirect off; - # proxy_buffering off; - # proxy_http_version 1.1; - # proxy_pass http://ss:8388/; - # proxy_set_header Host $http_host; - # proxy_set_header Upgrade $http_upgrade; - # proxy_set_header Connection "upgrade"; - # } # location /ws { # proxy_pass http://xr:443; # proxy_redirect off; diff --git a/config/nginx_default.conf b/config/nginx_default.conf index ae6f1d0..156be81 100644 --- a/config/nginx_default.conf +++ b/config/nginx_default.conf @@ -56,16 +56,6 @@ http { access_log /logs/nginx_tlgrm_access; proxy_pass http://php; } - location /v2ray { - access_log /logs/nginx_v2ray_access; - proxy_redirect off; - proxy_buffering off; - proxy_http_version 1.1; - proxy_pass http://ss:8388/; - proxy_set_header Host $http_host; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } location /ws { proxy_pass http://xr:443; proxy_redirect off; @@ -149,16 +139,6 @@ http { # root /certs/; # try_files $uri =404; # } - # location /v2ray { - # access_log /logs/nginx_v2ray_access; - # proxy_redirect off; - # proxy_buffering off; - # proxy_http_version 1.1; - # proxy_pass http://ss:8388/; - # proxy_set_header Host $http_host; - # proxy_set_header Upgrade $http_upgrade; - # proxy_set_header Connection "upgrade"; - # } # location /ws { # proxy_pass http://xr:443; # proxy_redirect off; diff --git a/docker-compose.yml b/docker-compose.yml index 8fa1567..b890bb7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,8 +44,6 @@ services: condition: service_healthy ad: condition: service_started - ss: - condition: service_started env_file: - path: ./.env required: true # default @@ -187,45 +185,13 @@ services: - up - ng - php - - proxy - wg - wg1 - ad - - ss - tg - xr - oc - np - proxy: - image: mercurykd/vpnbot-ss:1.2 - build: - dockerfile: dockerfile/shadowsocks.dockerfile - args: - image: ${IMAGE} - volumes: - - ./config/.profile:/root/.ashrc:ro - - ./config/sslocal.json:/config.json - - ./ssh:/ssh - - ./config/sshd_config:/etc/ssh/sshd_config - - ./scripts/start_proxy.sh:/start_proxy.sh - hostname: proxy - container_name: proxy-${VER} - depends_on: - php: - condition: service_healthy - networks: - default: - ipv4_address: 10.10.0.3 - environment: - TZ: ${TZ} - env_file: - - path: ./.env - required: true # default - - path: ./override.env - required: false - stop_grace_period: 1s - command: ["/bin/sh", "/start_proxy.sh"] - logging: *default-logging wg: image: mercurykd/vpnbot-wg:1.1 build: