Compare commits

..

49 Commits

Author SHA1 Message Date
mercury 5791cabfb5 update version 2024-08-16 12:12:07 +04:00
mercury 49d2d21f41 fix changelist 2024-08-16 11:41:42 +04:00
mercury 5263de514e fix naming ruleset 2024-08-16 11:24:51 +04:00
mercury 9da810ba3d fix empty rules route 2024-08-16 02:21:29 +04:00
mercury b663eca445 routes for sinbox 2024-08-16 02:08:44 +04:00
mercury f8f95e22ac backup for domain lists 2024-08-15 10:40:20 +04:00
mercury 30f0f8c5f0 fix selfpac update 2024-08-15 01:07:31 +04:00
mercury 741f402ca1 fix singbox import 2024-08-15 00:13:41 +04:00
mercury ef3d40c098 update version 2024-08-09 23:59:48 +04:00
mercury ded85fb79f fix "delete all" 2024-08-09 23:56:57 +04:00
mercury b5ca5fbf93 mirror 2024-08-08 17:11:26 +04:00
mercury 570420274e improve updatepac 2024-08-08 12:45:44 +04:00
mercury baaf0e2d01 clear pac list button 2024-08-06 21:58:08 +04:00
mercury be8bec6a7d fix ocserv pass 2024-08-04 11:51:01 +04:00
mercury acaec83877 update version 2024-08-03 11:19:00 +04:00
mercury 8cf6c512cb extended qr for wireguard 2024-08-03 11:14:53 +04:00
mercury 880a8de7e5 set mtu for wg 2024-08-03 10:39:15 +04:00
mercury 9662fc9d55 fix autobackup hint 2024-07-07 15:35:43 +04:00
mercury 561bcb7023 Merge branch 'dev' 2024-06-05 10:37:39 +04:00
mercury 9d7c735f79 Merge branch 'dev' of github.com:mercurykd/vpnbot into dev 2024-06-05 10:36:42 +04:00
mercury 8091eb4971 fix go version 2024-06-05 10:35:15 +04:00
mercury 967353bcd6 Merge branch 'dev' 2024-05-22 17:21:07 +04:00
mercury 9f218c9f32 chmod +x *.sh 2024-05-22 17:19:32 +04:00
mercury 6a6bd3a4d2 delete debug 2024-05-19 21:26:56 +04:00
mercury bc8b0ff033 Merge branch 'dev' 2024-05-18 17:05:44 +04:00
mercury 624713347a change autobackup 2024-05-18 17:00:04 +04:00
mercury 52738c0491 update version xray, shadowsocks 2024-05-17 12:56:56 +04:00
runalsh 277b00da87 Remove absolute versions for shadowsocks.dockerfile (#15)
* added sing-box from repo (#12)

* edge repo for sing-box (#13)

* added sing-box from repo

* add testing repo for sing-box

* Revert "added sing-box from repo (#12)"

This reverts commit 256e43352a.

* Revert "edge repo for sing-box (#13)"

This reverts commit bb1ac60acc.

* Update shadowsocks.dockerfile

---------

Co-authored-by: mercury <mercury.kd@gmail.com>
2024-05-17 12:47:28 +04:00
runalsh 455b9cea07 Remove absolute versions for xray.dockerfile (#16)
* added sing-box from repo (#12)

* edge repo for sing-box (#13)

* added sing-box from repo

* add testing repo for sing-box

* Revert "added sing-box from repo (#12)"

This reverts commit 256e43352a.

* Revert "edge repo for sing-box (#13)"

This reverts commit bb1ac60acc.

* Update xray.dockerfile

---------

Co-authored-by: mercury <mercury.kd@gmail.com>
2024-05-17 12:46:57 +04:00
mercury 88f8c1c4c2 changelog in update message 2024-05-04 21:56:40 +04:00
mercury 6017bc4008 Merge branch 'dev' 2024-05-04 13:00:53 +04:00
mercury 6631ea5cc2 update version 2024-05-04 13:00:06 +04:00
mercury 09d49fd0fb remove duplicate image 2024-05-04 12:36:32 +04:00
mercury 6766a56440 warp on alpine 2024-05-04 12:31:39 +04:00
mercury 0c3a6cc90e Merge branch 'dev' 2024-05-01 18:42:24 +04:00
mercury 4fb039ffc4 fix choice default template sing-box update 2 2024-05-01 18:35:45 +04:00
mercury 0b7ae110fc fix choice default template sing-box update 2024-05-01 18:24:22 +04:00
mercury c0750c930a Merge branch 'dev' 2024-05-01 17:53:13 +04:00
mercury 6fb1931c2d fix choice default template sing-box 2024-05-01 17:52:17 +04:00
mercury 45e1455d48 Revert "edge repo for sing-box (#13)"
This reverts commit bb1ac60acc.
2024-04-29 23:13:47 +04:00
mercury 7582dc50c2 Revert "added sing-box from repo (#12)"
This reverts commit 256e43352a.
2024-04-29 23:13:27 +04:00
runalsh bb1ac60acc edge repo for sing-box (#13)
* added sing-box from repo

* add testing repo for sing-box
2024-04-29 20:48:25 +04:00
runalsh 256e43352a added sing-box from repo (#12) 2024-04-29 16:06:52 +04:00
mercury 6a31985863 clear old images 2024-04-22 23:12:23 +04:00
mercury f4a9e63793 docker clean 2024-04-22 21:49:55 +04:00
mercury 581e3a9bd1 delete old image 2024-04-22 12:48:42 +04:00
mercury 8491ee9f51 fix star button freeze 2024-04-22 12:46:19 +04:00
Bkeenke 49cefc3231 Update "qrPeer" function (#11) 2024-04-21 12:06:32 +04:00
mercury b227431b7a singbox ruleset 2024-04-19 15:40:45 +04:00
40 changed files with 900 additions and 251 deletions
+662 -89
View File
File diff suppressed because it is too large Load Diff
+6 -2
View File
@@ -2,8 +2,8 @@
$i = [
'warp' => [
'en' => 'Warp',
'ru' => 'Warp',
'en' => 'warp',
'ru' => 'warp',
],
'wg_title' => [
'en' => 'Wireguard',
@@ -241,6 +241,10 @@ $i = [
'en' => 'defaultDNS',
'ru' => 'дефолтный днс',
],
'defaultMTU' => [
'en' => 'defaultMTU',
'ru' => 'дефолтный MTU',
],
'debug' => [
'en' => 'debug mode',
'ru' => 'режим отладки',
+6 -3
View File
@@ -17,10 +17,13 @@ if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
}
// pac
$type = $_GET['t'] ?? 'pac';
if (!empty($t = unserialize(base64_decode(explode('/', $_SERVER['REQUEST_URI'])[2])))) { // fix sing-box import
$_GET = array_merge($_GET, $t);
}
$type = $_GET['t'] ?? 'pac';
$address = $_GET['a'] ?: '127.0.0.1';
$port = $_GET['p'] ?: '1080';
$hash = $_GET['h'];
$port = $_GET['p'] ?: '1080';
$hash = $_GET['h'];
if ($hash == substr(md5($c['key']), 0, 8)) {
require __DIR__ . '/bot.php';
require __DIR__ . '/i18n.php';
+1
View File
@@ -40,3 +40,4 @@ file_put_contents('/update/message', '');
file_put_contents('/update/reload_message', '');
$bot->restartTG();
$bot->sslip();
$bot->cleanDocker();
+12 -6
View File
@@ -89,11 +89,14 @@ function start()
$conf = $bot->getPacConf();
$subzones = array_keys(array_filter($conf['subzoneslist'], fn($x) => $x == true));
if (!empty($conf['subzoneslist'])) {
$subzones = array_keys(array_filter($conf['subzoneslist'], fn($x) => $x == true));
}
// check && exclude
$include = array_filter($conf['includelist'], fn($x) => $x == true);
$domains = $include;
if (!empty($conf['includelist'])) {
$domains = array_filter($conf['includelist'], fn($x) => $x == true);
}
if (empty($domains)) {
$text = "Empty domains. Delete pac files";
unlink(__DIR__ . '/zapretlists/mpac');
@@ -146,10 +149,13 @@ function start()
file_put_contents(__DIR__ . '/zapretlists/pac', $pac);
$text .= "Create minified pac 100%\n";
}
// create reverse PAC
$domains = array_filter($conf['reverselist'], fn($x) => $x == true);
unset($domains);
if (!empty($conf['reverselist'])) {
$domains = array_filter($conf['reverselist'], fn($x) => $x == true);
}
if (empty($domains)) {
// $text .= "Empty reverse domains. Delete reverse pac files";
unlink(__DIR__ . '/zapretlists/rmpac');
unlink(__DIR__ . '/zapretlists/rpac');
@@ -197,6 +203,7 @@ function start()
file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
$text .= 'Create minified reverse pac 100%';
}
endScript($text);
}
@@ -242,7 +249,6 @@ $load = [
'-',
'\\',
];
switch ($_SERVER['argv'][1]) {
case 'start':
$bot = new Bot($c['key'], $i);
+1 -1
View File
@@ -16,7 +16,7 @@
<div style="position:absolute;top:0;right:0;width:35%;text-align:center;background-color: #17212b;">
<img src="toncoin.png" width="100%" alt="">
<a href="javascript:;" id="copy" style="color:white;text-decoration:none" data-id="UQCDDkaX3fCAFBek28Hx4TfvDDRqeizOW74blVMVAM4_m4OW">copy</a>
<iframe src="https://ghbtns.com/github-btn.html?user=mercurykd&repo=vpnbot&type=star&count=true" frameborder="0" scrolling="0" width="150" height="20" title="GitHub"></iframe>
<!-- <iframe src="https://ghbtns.com/github-btn.html?user=mercurykd&repo=vpnbot&type=star&count=true" frameborder="0" scrolling="0" width="150" height="20" title="GitHub"></iframe> -->
</div>
<a style="background-color: #8B3FFD;height: 46px;display:inline-block;padding:0 54px;color: white;border-radius: 12px;text-decoration: none;font-size: 20px;line-height: 46px;font-family: arial;" href="https://yoomoney.ru/to/410011827900450">
<svg style="width: 24px;fill: white;position: relative;top: 4px;" class="qa-fundraise-button-logo mui-m0okdh" viewBox="0 0 16 16"><path d="M4.638 8.5a5.67 5.67 0 015.681-5.68A5.693 5.693 0 0116 8.5a5.693 5.693 0 01-5.68 5.682A5.67 5.67 0 014.637 8.5zm3.56 0c0 1.151.97 2.122 2.121 2.122 1.15 0 2.085-.97 2.121-2.121 0-1.15-.97-2.121-2.12-2.121-1.151 0-2.122.97-2.122 2.12zm-3.596 4.243v-8.27H0l2.589 8.27h2.013z" clip-rule="evenodd"></path></svg>
+137 -87
View File
@@ -3,104 +3,154 @@
"level": "error",
"timestamp": true
},
"inbounds": [{
"type": "tun",
"tag": "tun-in",
"domain_strategy": "prefer_ipv4",
"interface_name": "sing-tun",
"inet4_address": "172.19.0.1\/30",
"mtu": 1400,
"gso": true,
"auto_route": true,
"strict_route": true,
"sniff": true,
"endpoint_independent_nat": false,
"stack": "mixed",
"platform": {
"http_proxy": {
"enabled": false,
"server": "127.0.0.1",
"server_port": 2080
"inbounds": [
{
"type": "tun",
"tag": "tun-in",
"domain_strategy": "prefer_ipv4",
"interface_name": "sing-tun",
"inet4_address": "172.19.0.1\/30",
"mtu": 1400,
"gso": true,
"auto_route": true,
"strict_route": true,
"sniff": true,
"endpoint_independent_nat": false,
"stack": "mixed",
"platform": {
"http_proxy": {
"enabled": false,
"server": "127.0.0.1",
"server_port": 2080
}
}
},
{
"type": "mixed",
"tag": "mixed-in",
"domain_strategy": "prefer_ipv4",
"listen": "127.0.0.1",
"listen_port": 2080,
"tcp_fast_open": true,
"sniff": true,
"sniff_override_destination": false,
"users": []
}
}, {
"type": "mixed",
"tag": "mixed-in",
"domain_strategy": "prefer_ipv4",
"listen": "127.0.0.1",
"listen_port": 2080,
"tcp_fast_open": true,
"sniff": true,
"sniff_override_destination": false,
"users": []
}],
],
"dns": {
"servers": [{
"tag": "dns_direct",
"address": "~dns~",
"address_resolver": "dns-remote",
"strategy": "prefer_ipv4",
"detour": "direct"
}, {
"tag": "dns-remote",
"address": "tcp:\/\/8.8.8.8",
"address_strategy": "prefer_ipv4",
"strategy": "prefer_ipv4",
"detour": "direct"
}],
"rules": [{
"outbound": "any",
"server": "dns-direct",
"disable_cache": false
}],
"servers": [
{
"tag": "dns_direct",
"address": "~dns~",
"address_resolver": "dns-remote",
"strategy": "prefer_ipv4",
"detour": "direct"
},
{
"tag": "dns-remote",
"address": "tcp:\/\/8.8.8.8",
"address_strategy": "prefer_ipv4",
"strategy": "prefer_ipv4",
"detour": "direct"
}
],
"rules": [
{
"outbound": "any",
"server": "dns-direct",
"disable_cache": false
}
],
"strategy": "ipv4_only",
"independent_cache": true
},
"outbounds": [{
"flow": "xtls-rprx-vision",
"packet_encoding": "",
"server": "",
"server_port": 443,
"tls": {
"enabled": true,
"insecure": false,
"reality": {
"outbounds": [
{
"flow": "xtls-rprx-vision",
"packet_encoding": "",
"server": "",
"server_port": 443,
"tls": {
"enabled": true,
"public_key": "",
"short_id": ""
"insecure": false,
"reality": {
"enabled": true,
"public_key": "",
"short_id": ""
},
"server_name": "",
"utls": {
"enabled": true,
"fingerprint": "chrome"
}
},
"server_name": "",
"utls": {
"enabled": true,
"fingerprint": "chrome"
}
"uuid": "",
"type": "vless",
"domain_strategy": "ipv4_only",
"tag": "proxy"
},
"uuid": "",
"type": "vless",
"domain_strategy": "ipv4_only",
"tag": "proxy"
}, {
"type": "direct",
"tag": "direct"
}, {
"type": "block",
"tag": "block"
}, {
"type": "dns",
"tag": "dns-out"
}],
{
"type": "direct",
"tag": "direct"
},
{
"type": "block",
"tag": "block"
},
{
"type": "dns",
"tag": "dns-out"
}
],
"route": {
"auto_detect_interface": true,
"override_android_vpn": true,
"rules": [{
"protocol": "dns",
"outbound": "dns-out"
}, {
"domain_suffix": "~pac~",
"outbound": "proxy"
}, {
"ip_cidr": ["0.0.0.0\/0"],
"outbound": "direct"
}]
"rules": [
{
"protocol": "dns",
"outbound": "dns-out"
},
{
"createruleset": [
{
"name": "pac",
"interval": "15s",
"rules": [
{
"domain_suffix": "~pac~"
}
]
},
{
"name": "warp",
"interval": "15s",
"rules": [
{
"domain_suffix": "~warp~"
}
]
}
],
"outbound": "proxy"
},
{
"createruleset": [
{
"name": "block",
"interval": "15s",
"rules": [
{
"domain_suffix": "~block~"
}
]
}
],
"outbound": "block"
},
{
"outbound": "direct"
}
],
"final": "direct"
}
}
+15 -10
View File
@@ -19,7 +19,7 @@ volumes:
services:
up:
image: mercurykd/vpnbot-up:1.1
image: mercurykd/vpnbot-ng:1.1
build:
context: dockerfile
dockerfile: nginx.dockerfile
@@ -93,7 +93,7 @@ services:
ipv4_address: 10.10.1.2
logging: *default-logging
php:
image: mercurykd/vpnbot-php:1.4
image: mercurykd/vpnbot-php:1.5
build:
dockerfile: dockerfile/php.dockerfile
args:
@@ -116,6 +116,7 @@ services:
- ./update:/update
- ./.git:/.git
- ./singbox_windows:/singbox
- /var/run/docker.sock:/var/run/docker.sock:ro
environment:
IP: ${IP}
VER: ${VER}
@@ -142,7 +143,7 @@ services:
timeout: 5s
retries: 5
service:
image: mercurykd/vpnbot-php:1.2
image: mercurykd/vpnbot-php:1.5
build:
dockerfile: dockerfile/php.dockerfile
args:
@@ -157,6 +158,7 @@ services:
- ./logs/:/logs/
- ./update:/update
- ./scripts/start_service.sh:/start_service.sh
- /var/run/docker.sock:/var/run/docker.sock:ro
environment:
IP: ${IP}
VER: ${VER}
@@ -189,7 +191,7 @@ services:
- oc
- np
proxy:
image: mercurykd/vpnbot-ss:1.1
image: mercurykd/vpnbot-ss:1.2
build:
dockerfile: dockerfile/shadowsocks.dockerfile
args:
@@ -336,7 +338,7 @@ services:
entrypoint: ["/bin/sh", "/start_ad.sh"]
logging: *default-logging
ss:
image: mercurykd/vpnbot-ss:1.1
image: mercurykd/vpnbot-ss:1.2
build:
dockerfile: dockerfile/shadowsocks.dockerfile
args:
@@ -397,7 +399,7 @@ services:
ipv4_address: 10.10.0.8
logging: *default-logging
xr:
image: mercurykd/vpnbot-xr:1.2
image: mercurykd/vpnbot-xr:1.3
build:
dockerfile: dockerfile/xray.dockerfile
args:
@@ -491,7 +493,7 @@ services:
ipv4_address: 10.10.0.12
logging: *default-logging
wp:
image: mercurykd/vpnbot-wp:1.1
image: mercurykd/vpnbot-wp:1.2
build:
dockerfile: dockerfile/warp.dockerfile
args:
@@ -501,7 +503,7 @@ services:
devices:
- /dev/net/tun:/dev/net/tun
volumes:
- ./config/.profile:/root/.bashrc:ro
- ./config/.profile:/root/.ashrc:ro
- ./ssh:/ssh
- ./config/sshd_config:/etc/ssh/sshd_config
- ./config:/config
@@ -512,8 +514,11 @@ services:
depends_on:
php:
condition: service_healthy
environment:
TZ: ${TZ}
env_file:
- path: ./.env
required: true # default
- path: ./override.env
required: false
stop_grace_period: 1s
command: ["/bin/sh", "/start_wp.sh"]
networks:
+6 -1
View File
@@ -26,5 +26,10 @@ RUN apk add --no-cache --update php81 \
&& tar -xf dnslookup-linux-amd64-v1.9.1.tar.gz \
&& mv linux-amd64/dnslookup /usr/bin \
&& rm dnslookup-linux-amd64-v1.9.1.tar.gz \
&& rm -rf /linux-amd64
&& rm -rf /linux-amd64 \
&& wget https://github.com/SagerNet/sing-box/releases/download/v1.8.11/sing-box-1.8.11-linux-amd64.tar.gz \
&& tar -xf sing-box-1.8.11-linux-amd64.tar.gz \
&& mv sing-box-1.8.11-linux-amd64/sing-box /usr/bin \
&& rm sing-box-1.8.11-linux-amd64.tar.gz \
&& rm -rf /sing-box-1.8.11-linux-amd64
ENV ENV="/root/.ashrc"
+6 -6
View File
@@ -2,16 +2,16 @@ ARG image
FROM $image
RUN apk add openssh git xz \
&& mkdir /root/.ssh \
&& wget https://github.com/shadowsocks/shadowsocks-rust/releases/download/v1.15.3/shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
&& tar -xf shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
&& wget https://github.com/teddysun/v2ray-plugin/releases/download/v5.7.0/v2ray-plugin-linux-amd64-v5.7.0.tar.gz \
&& tar -xf v2ray-plugin-linux-amd64-v5.7.0.tar.gz \
&& wget -O shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz $(wget -q -O - https://api.github.com/repos/shadowsocks/shadowsocks-rust/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep '.x86_64-unknown-linux-musl.tar.xz$') \
&& tar -xf shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz \
&& wget -O v2ray-plugin-linux-amd64.tar.gz $(wget -q -O - https://api.github.com/repos/teddysun/v2ray-plugin/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep 'v2ray-plugin-linux-amd64') \
&& tar -xf v2ray-plugin-linux-amd64.tar.gz \
&& mv sslocal /usr/bin/ \
&& mv ssserver /usr/bin/ \
&& mv ssmanager /usr/bin/ \
&& mv ssservice /usr/bin/ \
&& mv ssurl /usr/bin/ \
&& mv v2ray-plugin_linux_amd64 /usr/bin/v2ray-plugin \
&& rm v2ray-plugin-linux-amd64-v5.7.0.tar.gz\
&& rm shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz
&& rm v2ray-plugin-linux-amd64.tar.gz \
&& rm shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz
ENV ENV="/root/.ashrc"
+13 -3
View File
@@ -1,6 +1,16 @@
FROM ubuntu:22.04
RUN apt update && apt install -y curl gpg socat jq lsb-release openssh-server \
FROM ubuntu:22.04 AS build
RUN apt update && apt install -y curl gpg lsb-release \
&& curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg \
&& echo "deb [signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflare-client.list \
&& apt update && apt install -y cloudflare-warp \
&& apt update && apt install -y cloudflare-warp
FROM alpine:3.17
ARG GLIBC_VERSION=2.34-r0
COPY --from=build /usr/bin/warp-cli /usr/bin/warp-svc /usr/local/bin/
RUN apk add --no-cache dbus-libs wget socat openssh-server jq curl \
&& mkdir /tmp/glibc-pkgs \
&& for PKG in glibc-$GLIBC_VERSION.apk glibc-bin-$GLIBC_VERSION.apk; do wget -q --directory-prefix /tmp/glibc-pkgs https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/$PKG; done \
&& apk add --no-cache --allow-untrusted --force-overwrite /tmp/glibc-pkgs/* \
&& rm -rf /tmp/glibc-pkgs \
&& /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib \
&& mkdir /root/.ssh
+3 -1
View File
@@ -1,6 +1,8 @@
ARG image
FROM $image
RUN apk add --no-cache --virtual .build-deps alpine-sdk git go \
COPY --from=golang:1.22.3-alpine /usr/local/go/ /usr/local/go/
ENV PATH="/usr/local/go/bin:${PATH}"
RUN apk add --no-cache --virtual .build-deps alpine-sdk git \
&& apk add iproute2 linux-headers iptables xtables-addons openssh wireguard-tools jq bash htop \
&& git clone https://github.com/amnezia-vpn/amneziawg-go \
&& git clone https://github.com/amnezia-vpn/amneziawg-tools.git \
+1 -1
View File
@@ -2,7 +2,7 @@ ARG image
FROM $image
RUN apk add openssh openssl jq \
&& mkdir /root/.ssh \
&& wget https://github.com/XTLS/Xray-core/releases/download/v1.8.10/Xray-linux-64.zip \
&& wget -O Xray-linux-64.zip $(wget -q -O - https://api.github.com/repos/XTLS/Xray-core/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep 'Xray-linux-64.zip$') \
&& unzip Xray-linux-64.zip \
&& mv xray /usr/bin/ \
&& rm Xray-linux-64.zip \
+2 -2
View File
@@ -9,7 +9,7 @@ d: # остановка контейнеров
docker compose down --remove-orphans
dv: # остановка контейнеров
docker compose down -v
r: d cleanf u cleanf
r: d u
ps: # список контейнеров
docker compose ps
l: # логи из контейнеров
@@ -31,7 +31,7 @@ up: # консоль сервиса
ad: # консоль сервиса
docker compose exec ad /bin/sh
wp: # консоль сервиса
docker compose exec wp bash
docker compose exec wp /bin/sh
proxy: # консоль сервиса
docker compose exec proxy /bin/sh
tg: # консоль сервиса
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
+2 -3
View File
@@ -1,7 +1,6 @@
cat /ssh/key.pub > /root/.ssh/authorized_keys
echo 'HostKeyAlgorithms +ssh-rsa' >> /etc/ssh/sshd_config
echo 'PubkeyAcceptedKeyTypes +ssh-rsa' >> /etc/ssh/sshd_config
service ssh start
ssh-keygen -A
exec /usr/sbin/sshd -D -e "$@" &
warp-svc > /dev/null &
sleep 3
warp-cli --accept-tos registration new
Regular → Executable
View File
-35
View File
@@ -1,35 +0,0 @@
@echo off
setlocal
set "exe_path=sing-box.exe"
set "URL=~url~"
set "FileName=config.json"
set "PreviousHash="
taskkill /IM "%exe_path%" /F
powershell -command "(New-Object System.Net.WebClient).DownloadFile('%URL%', '%FileName%')"
for /F "skip=1 delims=" %%H in ('2^>nul CertUtil -hashfile "%FileName%" SHA256') do (
if not defined PreviousHash set "PreviousHash=%%H"
)
start "" /B "%CD%\%exe_path%" run -c "%FileName%"
echo "%PreviousHash%"
:loop
powershell -command "(New-Object System.Net.WebClient).DownloadFile('%URL%', '%FileName%')"
for /F "skip=1 delims=" %%H in ('2^>nul CertUtil -hashfile "%FileName%" SHA256') do (
if not defined HASH set "HASH=%%H"
)
set "CurrentHash=%HASH%"
set "HASH="
echo "%CurrentHash%"
if "%CurrentHash%" NEQ "%PreviousHash%" (
echo "change"
set "PreviousHash=%CurrentHash%"
taskkill /IM "%exe_path%" /F
start "" /B "%CD%\%exe_path%" run -c "%FileName%"
) else (
echo "not change"
)
timeout /t 15 /nobreak
goto :loop
+3 -1
View File
@@ -2,7 +2,8 @@
<id>singbox</id>
<name>singbox</name>
<description>singbox</description>
<executable>%BASE%\update.cmd</executable>
<executable>%BASE%\sing-box.exe</executable>
<arguments>run -c %BASE%\config.json</arguments>
<logmode>rotate</logmode>
<onfailure action="restart" delay="10 sec" />
<onfailure action="restart" delay="20 sec" />
@@ -12,4 +13,5 @@
<onexit action="restart" />
<onexit action="restart" />
<onexit action="none" />
<download from="~url~" to="%BASE%\config.json"/>
</service>
Regular → Executable
View File
+24
View File
@@ -1,3 +1,27 @@
16.08.2024 v1.42
- добавлена возможность сохранять/восстанавливать список доменов/правил маршрутизации
- изменена ссылка на сингбокс-конфиг для совместимости с клиентом сингбокса (фикс импорта в sing-box)
- sing-box: добавлена возможность добавлять свои packagename (outbound:proxy)
- sing-box: добавлена возможность добавлять свои ruleset с указанием outbound и временем обновления
- sing-box: списки доменов pac/warp/block трансформируются в собственный ruleset и присутствуют в шаблоне origin всегда, даже если они пустые. это дает возможность не ждать перезагрузки конфига клиентом
09.08.2024 v1.41.1
- фикс для "удалить все" в списках доменов
06.08.2024 v1.41
- возможность очистить РАС лист
03.08.2024 v1.40
- возможность менять MTU для Wireguard/Amnezia
- раздельный qr для AmneziaWG + AmneziaVPN
18.05.2024 v1.39
- изменен автобэкап
04.05.2024 v1.38
- changelog в сообщении новой версии
04.05.2024 v1.37.1
- warp на образе alpine (thx @zmeyzloy)
- фикс выбора шаблона singbox
22.04.2024 v1.35
- очистка старых образов
19.04.2024 v1.34
- формирование rule_set из шаблона singbox
18.04.2024 v1.33
- вывод статуса warp в меню
18.04.2024 v1.32