Compare commits
77 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 mercury
|
49d0827b9e | ||
|
mercury
|
07e04c384a | ||
|
mercury
|
579457b4f4 | ||
|
mercury
|
3dac9416ca | ||
|
mercury
|
5b4d3b5627 | ||
|
mercury
|
658e125cd8 | ||
|
Konstantin
|
1840555573 | ||
|
legiz-ru
|
ecdc028226 | ||
|
mercury
|
d432bf82f2 | ||
|
mercury
|
211e2c079d | ||
|
Konstantin
|
1696c4da7b | ||
|
legiz-ru
|
b8d5700eba | ||
|
mercury
|
7e20c14299 | ||
|
mercury
|
b9155cf674 | ||
|
mercury
|
159f775e12 | ||
|
mercury
|
ae672439be | ||
|
mercury
|
6dafba5618 | ||
|
mercury
|
7daf61a4f5 | ||
|
mercury
|
f9266827c9 | ||
|
mercury
|
9e22c64771 | ||
|
mercury
|
a2026a4436 | ||
|
mercury
|
95c5b5b8fd | ||
|
mercury
|
efbe20485a | ||
|
mercury
|
475eea1f47 | ||
|
mercury
|
02d9cdcccc | ||
|
mercury
|
d633799f11 | ||
|
Konstantin
|
ead66c3951 | ||
|
legiz-ru
|
bd7742d8b2 | ||
|
legiz-ru
|
ac593629a8 | ||
|
mercury
|
9932ee1e00 | ||
|
mercury
|
1a6e9f43e8 | ||
|
mercury
|
76373ffcf2 | ||
|
mercury
|
43c59a9ed6 | ||
|
mercury
|
8b3c6ca547 | ||
|
mercury
|
63654e7ad7 | ||
|
mercury
|
dcb4f72f07 | ||
|
mercury
|
90afbbedb0 | ||
|
mercury
|
1964ed0079 | ||
|
mercury
|
2525181655 | ||
|
mercury
|
ef690349fd | ||
|
mercury
|
2c1db5f233 | ||
|
mercury
|
554d7f3a25 | ||
|
mercury
|
f2a1ec1b71 | ||
|
mercury
|
04f1bf564c | ||
|
mercury
|
1116f8ec75 | ||
|
mercury
|
f8e5b54a98 | ||
|
mercury
|
3929032e7a | ||
|
mercury
|
057917a24a | ||
|
mercury
|
941fc05e21 | ||
|
mercury
|
797088a328 | ||
|
mercury
|
45614eaf3b | ||
|
mercury
|
47113b4940 | ||
|
mercury
|
3febfe1d3d | ||
|
mercury
|
90084c37ff | ||
|
mercury
|
b49f088256 | ||
|
mercury
|
09a0f77863 | ||
|
mercury
|
8c65f8e538 | ||
|
mercury
|
32e49088c2 | ||
|
Konstantin
|
f666762dfa | ||
|
legiz-ru
|
a1778e6be8 | ||
|
Konstantin
|
4b61e38b6b | ||
|
legiz-ru
|
270968e4ac | ||
|
mercury
|
3349e3b306 | ||
|
mercury
|
3e53000065 | ||
|
mercury
|
18ceb51f4e | ||
|
mercury
|
99bce7a988 | ||
|
mercury
|
446a5d7150 | ||
|
mercury
|
855f516936 | ||
|
mercury
|
e1c13480d1 | ||
|
mercury
|
bd5e10fa23 | ||
|
mercury
|
3627b389b4 | ||
|
mercury
|
f3f9cb5348 | ||
|
mercury
|
1527b9f856 | ||
|
mercury
|
f896b307ea | ||
|
mercury
|
b3366edb6e | ||
|
mercury
|
1edc9e8608 | ||
|
mercury
|
8a3d9c1007 |
+637
-398
File diff suppressed because it is too large
Load Diff
+9
-5
@@ -2,8 +2,8 @@
|
||||
|
||||
$i = [
|
||||
'warp' => [
|
||||
'en' => 'warp',
|
||||
'ru' => 'warp',
|
||||
'en' => 'Warp',
|
||||
'ru' => 'Warp',
|
||||
],
|
||||
'wg_title' => [
|
||||
'en' => 'Wireguard',
|
||||
@@ -22,7 +22,7 @@ $i = [
|
||||
'ru' => 'AdGuard',
|
||||
],
|
||||
'config' => [
|
||||
'en' => 'config',
|
||||
'en' => 'Settings',
|
||||
'ru' => 'настройки',
|
||||
],
|
||||
'pac' => [
|
||||
@@ -262,8 +262,12 @@ $i = [
|
||||
'ru' => 'очистить',
|
||||
],
|
||||
'xray' => [
|
||||
'en' => 'Xray',
|
||||
'ru' => 'Xray',
|
||||
'en' => 'Vless',
|
||||
'ru' => 'Vless',
|
||||
],
|
||||
'clash' => [
|
||||
'en' => 'mihomo',
|
||||
'ru' => 'mihomo',
|
||||
],
|
||||
'geodb' => [
|
||||
'en' => 'GeoIp/GeoSite',
|
||||
|
||||
+131
-137
@@ -1,129 +1,18 @@
|
||||
<?php
|
||||
|
||||
require __DIR__ . '/timezone.php';
|
||||
|
||||
// bot
|
||||
require __DIR__ . '/config.php';
|
||||
if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
|
||||
if ($c['debug']) {
|
||||
require __DIR__ . '/debug.php';
|
||||
}
|
||||
require __DIR__ . '/calc.php';
|
||||
require __DIR__ . '/bot.php';
|
||||
require __DIR__ . '/i18n.php';
|
||||
if (file_exists(__DIR__ . '/override.php')) {
|
||||
include __DIR__ . '/override.php';
|
||||
}
|
||||
$bot = new Bot($c['key'], $i);
|
||||
$bot->input();
|
||||
exit;
|
||||
if ($c['debug']) {
|
||||
require __DIR__ . '/debug.php';
|
||||
}
|
||||
|
||||
// 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'];
|
||||
if ($hash == substr(md5($c['key']), 0, 8)) {
|
||||
require __DIR__ . '/bot.php';
|
||||
require __DIR__ . '/i18n.php';
|
||||
$bot = new Bot($c['key'], $i);
|
||||
switch ($type) {
|
||||
case 'mirror':
|
||||
$bot->getMirror();
|
||||
break;
|
||||
case 's':
|
||||
case 'si':
|
||||
case 'cl':
|
||||
$bot->subscription();
|
||||
exit;
|
||||
|
||||
case 'te':
|
||||
if (!empty($_GET['te'])) {
|
||||
$t = $bot->getPacConf()["{$_GET['ty']}templates"][$_GET['te']];
|
||||
} else {
|
||||
$t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
|
||||
}
|
||||
if ($t) {
|
||||
header('Content-Type: text/html');
|
||||
$t = json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||
$name = $_GET['te'] ?: 'origin';
|
||||
$type = $_GET['ty'];
|
||||
echo <<<HTML
|
||||
<!DOCTYPE HTML>
|
||||
<html lang="en" style="height:100%">
|
||||
<head>
|
||||
<!-- when using the mode "code", it's important to specify charset utf-8 -->
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<link href="jsoneditor.min.css" rel="stylesheet" type="text/css">
|
||||
<script src="jsoneditor.min.js"></script>
|
||||
<script src="jquery-3.7.1.min.js"></script>
|
||||
<script src="https://telegram.org/js/telegram-web-app.js"></script>
|
||||
</head>
|
||||
<body style="height:100%">
|
||||
<div id="jsoneditor" style="height:100%"></div>
|
||||
|
||||
<script>
|
||||
jQuery(function($) {
|
||||
var tg = window.Telegram.WebApp;
|
||||
// create the editor
|
||||
const container = document.getElementById("jsoneditor")
|
||||
const options = {}
|
||||
const editor = new JSONEditor(container, options)
|
||||
editor.set({$t})
|
||||
tg.MainButton.show().setText('{$bot->i18n('save')}').onClick(function (e) {
|
||||
var self = this;
|
||||
$.ajax({
|
||||
url: '/webapp/save?' + tg.initData,
|
||||
method: 'POST',
|
||||
data: {
|
||||
name: '$name',
|
||||
type: '$type',
|
||||
json: editor.getText()
|
||||
},
|
||||
dataType: 'json'
|
||||
}).done(function (r) {
|
||||
if (r.status == true) {
|
||||
tg.MainButton.setText('{$bot->i18n('success')}')
|
||||
setTimeout(() => {
|
||||
tg.close();
|
||||
}, 500);
|
||||
} else {
|
||||
tg.MainButton.setText(r.message);
|
||||
}
|
||||
}).fail(function (r) {
|
||||
tg.MainButton.setText('{$bot->i18n('error')}')
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
HTML;
|
||||
exit;
|
||||
}
|
||||
|
||||
default:
|
||||
if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
|
||||
$pac = file_get_contents($file);
|
||||
header('Content-Type: text/plain');
|
||||
echo str_replace([
|
||||
'~address~',
|
||||
'~port~',
|
||||
], [
|
||||
$address,
|
||||
$port,
|
||||
], $pac);
|
||||
exit;
|
||||
}
|
||||
break;
|
||||
}
|
||||
require __DIR__ . '/calc.php';
|
||||
require __DIR__ . '/bot.php';
|
||||
require __DIR__ . '/i18n.php';
|
||||
if (file_exists(__DIR__ . '/override.php')) {
|
||||
include __DIR__ . '/override.php';
|
||||
}
|
||||
$bot = new Bot($c['key'], $i);
|
||||
$hash = $bot->getHashBot();
|
||||
if (!empty($_GET['hash'])) {
|
||||
$t = $_GET;
|
||||
unset($t['hash']);
|
||||
@@ -131,22 +20,127 @@ if (!empty($_GET['hash'])) {
|
||||
foreach ($t as $k => $v) {
|
||||
$s[] = "$k=$v";
|
||||
}
|
||||
$s = implode("\n", $s);
|
||||
$sk = hash_hmac('sha256', $c['key'], "WebAppData", true);
|
||||
if (hash_hmac('sha256', $s, $sk) == $_GET['hash']) {
|
||||
require __DIR__ . '/bot.php';
|
||||
require __DIR__ . '/i18n.php';
|
||||
$bot = new Bot($c['key'], $i);
|
||||
if (!empty($_POST['json'])) {
|
||||
echo json_encode($bot->saveTemplate($_POST['name'], $_POST['type'], $_POST['json']));
|
||||
die();
|
||||
} else {
|
||||
setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
|
||||
setcookie('a', $bot->adguardBasicAuth(), 0, '/');
|
||||
}
|
||||
die('ok');
|
||||
}
|
||||
$s = implode("\n", $s);
|
||||
$sk = hash_hmac('sha256', $c['key'], "WebAppData", true);
|
||||
$webapp = hash_hmac('sha256', $s, $sk) == $_GET['hash'];
|
||||
}
|
||||
|
||||
header('500', true, 500);
|
||||
exit;
|
||||
switch (true) {
|
||||
// tlgrm
|
||||
case 'POST' == $_SERVER['REQUEST_METHOD'] && preg_match('~^/tlgrm~', $_SERVER['REQUEST_URI']) && $_GET['k'] == $c['key']:
|
||||
$bot->input();
|
||||
break;
|
||||
|
||||
// save template
|
||||
case preg_match('~^' . preg_quote("/webapp$hash/save") . '~', $_SERVER['REQUEST_URI']) && $webapp && !empty($_POST['json']):
|
||||
echo json_encode($bot->saveTemplate($_POST['name'], $_POST['type'], $_POST['json']));
|
||||
break;
|
||||
|
||||
// adguard cookie
|
||||
case preg_match('~^' . preg_quote("/webapp$hash/check") . '~', $_SERVER['REQUEST_URI']) && $webapp:
|
||||
setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
|
||||
echo "/adguard$hash/";
|
||||
break;
|
||||
|
||||
// subs & pac
|
||||
case preg_match('~^' . preg_quote("/pac$hash") . '~', $_SERVER['REQUEST_URI']):
|
||||
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';
|
||||
switch ($type) {
|
||||
case 's':
|
||||
case 'si':
|
||||
case 'cl':
|
||||
$bot->subscription();
|
||||
exit;
|
||||
|
||||
case 'te':
|
||||
if (!empty($_GET['te'])) {
|
||||
$t = $bot->getPacConf()["{$_GET['ty']}templates"][$_GET['te']];
|
||||
} else {
|
||||
$t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
|
||||
}
|
||||
if ($t) {
|
||||
header('Content-Type: text/html');
|
||||
$t = json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||
$name = $_GET['te'] ?: 'origin';
|
||||
$type = $_GET['ty'];
|
||||
echo <<<HTML
|
||||
<!DOCTYPE HTML>
|
||||
<html lang="en" style="height:100%">
|
||||
<head>
|
||||
<!-- when using the mode "code", it's important to specify charset utf-8 -->
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<link href="/webapp$hash/jsoneditor.min.css" rel="stylesheet" type="text/css">
|
||||
<script src="/webapp$hash/jsoneditor.min.js"></script>
|
||||
<script src="/webapp$hash/jquery-3.7.1.min.js"></script>
|
||||
<script src="https://telegram.org/js/telegram-web-app.js"></script>
|
||||
</head>
|
||||
<body style="height:100%">
|
||||
<div id="jsoneditor" style="height:100%"></div>
|
||||
|
||||
<script>
|
||||
jQuery(function($) {
|
||||
var tg = window.Telegram.WebApp;
|
||||
// create the editor
|
||||
const container = document.getElementById("jsoneditor")
|
||||
const options = {}
|
||||
const editor = new JSONEditor(container, options)
|
||||
editor.set({$t})
|
||||
tg.MainButton.show().setText('{$bot->i18n('save')}').onClick(function (e) {
|
||||
var self = this;
|
||||
$.ajax({
|
||||
url: '/webapp$hash/save?' + tg.initData,
|
||||
method: 'POST',
|
||||
data: {
|
||||
name: '$name',
|
||||
type: '$type',
|
||||
json: editor.getText()
|
||||
},
|
||||
dataType: 'json'
|
||||
}).done(function (r) {
|
||||
if (r.status == true) {
|
||||
tg.MainButton.setText('{$bot->i18n('success')}')
|
||||
setTimeout(() => {
|
||||
tg.close();
|
||||
}, 500);
|
||||
} else {
|
||||
tg.MainButton.setText(r.message);
|
||||
}
|
||||
}).fail(function (r) {
|
||||
tg.MainButton.setText('{$bot->i18n('error')}')
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
HTML;
|
||||
exit;
|
||||
}
|
||||
|
||||
default:
|
||||
if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
|
||||
$pac = file_get_contents($file);
|
||||
header('Content-Type: text/plain');
|
||||
echo str_replace([
|
||||
'~address~',
|
||||
'~port~',
|
||||
], [
|
||||
$address,
|
||||
$port,
|
||||
], $pac);
|
||||
exit;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
header('500', true, 500);
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ if ($c['debug']) {
|
||||
$bot = new Bot($c['key'], $i);
|
||||
|
||||
$bot->selfUpdate();
|
||||
$bot->ssPswdCheck();
|
||||
$bot->restartTG();
|
||||
if (!empty($bot->selfupdate)) {
|
||||
$bot->offWarp();
|
||||
@@ -20,5 +21,6 @@ if (!empty($bot->selfupdate)) {
|
||||
$bot->dontshowcron = 1;
|
||||
$bot->sslip();
|
||||
$bot->adguardSync();
|
||||
$bot->cloakNginx();
|
||||
$bot->syncDeny();
|
||||
$bot->cleanDocker();
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
$.ajax({
|
||||
'url': 'check?' + tg.initData,
|
||||
}).done(function (r) {
|
||||
location.replace('/adguard/');
|
||||
location.replace(r);
|
||||
}).fail(function (r) {
|
||||
location.replace('/');
|
||||
});
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Login</title>
|
||||
<style>
|
||||
/* Design based on Blue Login Field of Kevin Sleger https://codepen.io/MurmeltierS/pen/macKb */
|
||||
|
||||
body {
|
||||
background: #44c4e7 url("https://photos-6.dropbox.com/t/2/AAC_bdqR8LMkjEe-HPIf4K1DhtseMLRHPklBSzJSuzglvA/12/5714737/jpeg/1024x768/3/1418346000/0/2/bkg-blur.jpg/CLHm3AIgASgBKAI/b7RrveA2022yJyfO9RyRvv7LjJQESukGHssHUxVThzw") no-repeat center center fixed;
|
||||
background-size: cover;
|
||||
font-family: "Roboto";
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
|
||||
&::before {
|
||||
z-index: -1;
|
||||
content: '';
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background: #44c4e7;
|
||||
/* IE Fallback */
|
||||
background: rgba(68, 196, 231, 0.8);
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.form {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
background: #fff;
|
||||
width: 285px;
|
||||
margin: -140px 0 0 -182px;
|
||||
padding: 40px;
|
||||
box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
|
||||
|
||||
h2 {
|
||||
margin: 0 0 20px;
|
||||
line-height: 1;
|
||||
color: #44c4e7;
|
||||
font-size: 18px;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
input {
|
||||
outline: none;
|
||||
display: block;
|
||||
width: 100%;
|
||||
margin: 0 0 20px;
|
||||
padding: 10px 15px;
|
||||
border: 1px solid #ccc;
|
||||
color: #ccc;
|
||||
font-family: "Roboto";
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
font-wieght: 400;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
transition: 0.2s linear;
|
||||
|
||||
&input:focus {
|
||||
color: #333;
|
||||
border: 1px solid #44c4e7;
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
cursor: pointer;
|
||||
background: #44c4e7;
|
||||
width: 100%;
|
||||
padding: 10px 15px;
|
||||
border: 0;
|
||||
color: #fff;
|
||||
font-family: "Roboto";
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
|
||||
&:hover {
|
||||
background: #369cb8;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.error,
|
||||
.valid {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
<script src="jquery-3.7.1.min.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<section class="form animated flipInX">
|
||||
<h2>Login To Your Account</h2>
|
||||
<p class="valid">Valid. Please wait a moment.</p>
|
||||
<p class="error">Error. Please enter correct Username & password.</p>
|
||||
<form class="loginbox" autocomplete="off">
|
||||
<input placeholder="Username" type="text" id="username"></input>
|
||||
<input placeholder="Password" type="password" id="password"></input>
|
||||
<button id="submit">Login</button>
|
||||
</form>
|
||||
</section>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$('#submit').click(function () {
|
||||
event.preventDefault(); // prevent PageReLoad
|
||||
$('.error').css('display', 'block'); // show error msg
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
+28
-11
@@ -6,7 +6,7 @@
|
||||
"find-process-mode": "strict",
|
||||
"global-client-fingerprint": "chrome",
|
||||
"mode": "rule",
|
||||
"log-level": "debug",
|
||||
"log-level": "info",
|
||||
"ipv6": false,
|
||||
"keep-alive-interval": 30,
|
||||
"unified-delay": false,
|
||||
@@ -90,31 +90,48 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"add-rule-providers": true,
|
||||
"rule-providers": {},
|
||||
"rules": [
|
||||
{
|
||||
"type": "DOMAIN-SUFFIX",
|
||||
"type": "RULE-SET",
|
||||
"list": "~block~",
|
||||
"action": "REJECT"
|
||||
"action": "REJECT",
|
||||
"interval": 30,
|
||||
"behavior": "domain",
|
||||
"name": "block"
|
||||
},
|
||||
{
|
||||
"type": "PROCESS-NAME",
|
||||
"type": "RULE-SET",
|
||||
"list": "~process~",
|
||||
"action": "PROXY"
|
||||
"action": "PROXY",
|
||||
"interval": 30,
|
||||
"behavior": "classical",
|
||||
"name": "process"
|
||||
},
|
||||
{
|
||||
"type": "PROCESS-NAME",
|
||||
"type": "RULE-SET",
|
||||
"list": "~package~",
|
||||
"action": "PROXY"
|
||||
"action": "PROXY",
|
||||
"interval": 30,
|
||||
"behavior": "classical",
|
||||
"name": "package"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN-SUFFIX",
|
||||
"type": "RULE-SET",
|
||||
"list": "~warp~",
|
||||
"action": "PROXY"
|
||||
"action": "PROXY",
|
||||
"interval": 30,
|
||||
"behavior": "domain",
|
||||
"name": "warp"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN-SUFFIX",
|
||||
"type": "RULE-SET",
|
||||
"list": "~pac~",
|
||||
"action": "PROXY"
|
||||
"action": "PROXY",
|
||||
"interval": 30,
|
||||
"behavior": "domain",
|
||||
"name": "pac"
|
||||
},
|
||||
{
|
||||
"type": "MATCH",
|
||||
|
||||
+194
-176
@@ -1,197 +1,215 @@
|
||||
user nginx;
|
||||
worker_processes auto;
|
||||
user nginx;
|
||||
worker_processes auto;
|
||||
|
||||
error_log /logs/nginx_error;
|
||||
pid /var/run/nginx.pid;
|
||||
error_log /logs/nginx_error;
|
||||
pid /var/run/nginx.pid;
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
http {
|
||||
server_names_hash_bucket_size 64;
|
||||
include include.conf;
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
server_names_hash_bucket_size 64;
|
||||
server_tokens off;
|
||||
include include.conf;
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
# Proxy Cache storage - so we can cache the DoH response from the upstream
|
||||
proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m;
|
||||
# Proxy Cache storage - so we can cache the DoH response from the upstream
|
||||
proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m;
|
||||
|
||||
real_ip_header proxy_protocol;
|
||||
real_ip_recursive on;
|
||||
set_real_ip_from 10.10.0.10;
|
||||
real_ip_header proxy_protocol;
|
||||
real_ip_recursive on;
|
||||
set_real_ip_from 10.10.0.10;
|
||||
|
||||
server {
|
||||
listen 10.10.0.2:80 default_server;
|
||||
listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
|
||||
ssl_certificate /certs/self_public;
|
||||
ssl_certificate_key /certs/self_private;
|
||||
server {
|
||||
listen 80 default_server;
|
||||
|
||||
access_log /logs/nginx_default_access;
|
||||
|
||||
location / {
|
||||
root /app;
|
||||
index override.html login.html;
|
||||
try_files $uri $uri/ =404;
|
||||
location / {
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
location ~\.well-known {
|
||||
access_log /logs/nginx_certbot_access;
|
||||
root /certs/;
|
||||
try_files $uri =404;
|
||||
}
|
||||
}
|
||||
location /adguard/ {
|
||||
access_log /logs/nginx_adguard_access;
|
||||
proxy_pass http://ad:80/;
|
||||
proxy_redirect / /adguard/;
|
||||
proxy_cookie_path / /adguard/;
|
||||
|
||||
server {
|
||||
listen 10.10.0.2:443 ssl http2 proxy_protocol default_server;
|
||||
listen 10.10.1.2:443 ssl http2 default_server;
|
||||
ssl_certificate /certs/self_public;
|
||||
ssl_certificate_key /certs/self_private;
|
||||
|
||||
access_log /logs/nginx_ip_access;
|
||||
|
||||
location = / {
|
||||
root /app;
|
||||
try_files $uri /override.html @auth;
|
||||
}
|
||||
|
||||
location / {
|
||||
root /app;
|
||||
auth_basic "Restricted Content";
|
||||
auth_basic_user_file /app/.htpasswd;
|
||||
try_files $uri =404;
|
||||
}
|
||||
location @auth {
|
||||
root /app;
|
||||
auth_basic "Restricted Content";
|
||||
auth_basic_user_file /app/.htpasswd;
|
||||
try_files $uri =404;
|
||||
}
|
||||
|
||||
location /tlgrm {
|
||||
access_log /logs/nginx_tlgrm_access;
|
||||
proxy_pass http://php;
|
||||
}
|
||||
|
||||
location @php {
|
||||
proxy_pass http://php;
|
||||
}
|
||||
|
||||
location /adguard/ {
|
||||
}
|
||||
|
||||
location /webapp {
|
||||
access_log /logs/nginx_webapp_access;
|
||||
alias /app;
|
||||
index index.html;
|
||||
try_files $uri $uri/ @php;
|
||||
}
|
||||
|
||||
location /pac {
|
||||
access_log /logs/nginx_pac_access;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_pass http://php;
|
||||
}
|
||||
|
||||
location /ws {
|
||||
proxy_pass http://xr:443;
|
||||
proxy_redirect off;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_read_timeout 5d;
|
||||
}
|
||||
|
||||
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 /dns-query {
|
||||
access_log /logs/nginx_doh_access;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Connection "";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Host $remote_addr;
|
||||
proxy_cache doh_cache;
|
||||
proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
proxy_pass https://ad/dns-query;
|
||||
}
|
||||
}
|
||||
location /webapp {
|
||||
access_log /logs/nginx_webapp_access;
|
||||
alias /app;
|
||||
index index.html;
|
||||
try_files $uri $uri/ /pac?$query_string;
|
||||
}
|
||||
location /pac {
|
||||
access_log /logs/nginx_pac_access;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_pass http://php;
|
||||
}
|
||||
location /tlgrm {
|
||||
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;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_read_timeout 5d;
|
||||
}
|
||||
#-ssl
|
||||
# # The DoH server block
|
||||
# location /dns-query {
|
||||
# access_log /logs/nginx_doh_access;
|
||||
# # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Connection "";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Proto https;
|
||||
# proxy_set_header X-Forwarded-For $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Host $remote_addr;
|
||||
|
||||
# # Enable Cache, and set the cache_key to include the request_body
|
||||
# proxy_cache doh_cache;
|
||||
# proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
#~
|
||||
|
||||
# # proxy pass to the dohloop upstream
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
#-ssl
|
||||
location ~\.well-known {
|
||||
access_log /logs/nginx_certbot_access;
|
||||
root /certs/;
|
||||
try_files $uri =404;
|
||||
}
|
||||
}
|
||||
#-domain
|
||||
# server {
|
||||
# server_name domain;
|
||||
# listen 10.10.0.2:443 ssl http2 proxy_protocol;
|
||||
# listen 10.10.1.2:443 ssl http2;
|
||||
# ssl_certificate /certs/cert_public;
|
||||
# ssl_certificate_key /certs/cert_private;
|
||||
|
||||
#~
|
||||
# access_log /logs/nginx_domain_access;
|
||||
|
||||
#-domain
|
||||
# server {
|
||||
# listen 10.10.0.2:80;
|
||||
# server_name ;
|
||||
#-domain
|
||||
#-ssl
|
||||
# listen 10.10.0.2:443 ssl http2 proxy_protocol;
|
||||
# listen 10.10.1.2:443 ssl http2;
|
||||
# ssl_certificate /certs/cert_public;
|
||||
# ssl_certificate_key /certs/cert_private;
|
||||
#-ssl
|
||||
# location = / {
|
||||
# root /app;
|
||||
# try_files $uri /override.html @auth;
|
||||
# }
|
||||
|
||||
#-domain
|
||||
# access_log /logs/nginx_domain_access;
|
||||
# location / {
|
||||
# root /app;
|
||||
# auth_basic "Restricted Content";
|
||||
# auth_basic_user_file /app/.htpasswd;
|
||||
# try_files $uri =404;
|
||||
# }
|
||||
# location @auth {
|
||||
# root /app;
|
||||
# auth_basic "Restricted Content";
|
||||
# auth_basic_user_file /app/.htpasswd;
|
||||
# try_files $uri =404;
|
||||
# }
|
||||
|
||||
# location / {
|
||||
# root /app;
|
||||
# index override.html login.html;
|
||||
# try_files $uri $uri/ =404;
|
||||
# }
|
||||
# location /adguard/ {
|
||||
# access_log /logs/nginx_adguard_access;
|
||||
# proxy_pass http://ad:80/;
|
||||
# proxy_redirect / /adguard/;
|
||||
# proxy_cookie_path / /adguard/;
|
||||
# }
|
||||
# location /webapp {
|
||||
# access_log /logs/nginx_webapp_access;
|
||||
# alias /app;
|
||||
# index index.html;
|
||||
# try_files $uri $uri/ /pac?$query_string;
|
||||
# }
|
||||
# location /pac {
|
||||
# access_log /logs/nginx_pac_access;
|
||||
# proxy_set_header Host $http_host;
|
||||
# proxy_pass http://php;
|
||||
# }
|
||||
# location ~\.well-known {
|
||||
# access_log /logs/nginx_certbot_access;
|
||||
# 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;
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Upgrade $http_upgrade;
|
||||
# proxy_set_header Connection "upgrade";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# proxy_read_timeout 5d;
|
||||
# }
|
||||
#-domain
|
||||
#-ssl
|
||||
# # The DoH server block
|
||||
# location /dns-query {
|
||||
# access_log /logs/nginx_doh_access;
|
||||
# # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Connection "";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Proto https;
|
||||
# proxy_set_header X-Forwarded-For $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Host $remote_addr;
|
||||
# location @php {
|
||||
# proxy_pass http://php;
|
||||
# }
|
||||
|
||||
# # Enable Cache, and set the cache_key to include the request_body
|
||||
# proxy_cache doh_cache;
|
||||
# proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
# location /adguard/ {
|
||||
# }
|
||||
|
||||
# # proxy pass to the dohloop upstream
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
#-ssl
|
||||
#-domain
|
||||
# }
|
||||
#-domain
|
||||
# location /webapp {
|
||||
# access_log /logs/nginx_webapp_access;
|
||||
# alias /app;
|
||||
# index index.html;
|
||||
# try_files $uri $uri/ @php;
|
||||
# }
|
||||
|
||||
# location /pac {
|
||||
# access_log /logs/nginx_pac_access;
|
||||
# proxy_set_header Host $http_host;
|
||||
# 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;
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Upgrade $http_upgrade;
|
||||
# proxy_set_header Connection "upgrade";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# proxy_read_timeout 5d;
|
||||
# }
|
||||
|
||||
# location /dns-query {
|
||||
# access_log /logs/nginx_doh_access;
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Connection "";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Proto https;
|
||||
# proxy_set_header X-Forwarded-For $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Host $remote_addr;
|
||||
# proxy_cache doh_cache;
|
||||
# proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
# }
|
||||
#-domain
|
||||
}
|
||||
|
||||
+194
-176
@@ -1,197 +1,215 @@
|
||||
user nginx;
|
||||
worker_processes auto;
|
||||
user nginx;
|
||||
worker_processes auto;
|
||||
|
||||
error_log /logs/nginx_error;
|
||||
pid /var/run/nginx.pid;
|
||||
error_log /logs/nginx_error;
|
||||
pid /var/run/nginx.pid;
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
http {
|
||||
server_names_hash_bucket_size 64;
|
||||
include include.conf;
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
server_names_hash_bucket_size 64;
|
||||
server_tokens off;
|
||||
include include.conf;
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
# Proxy Cache storage - so we can cache the DoH response from the upstream
|
||||
proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m;
|
||||
# Proxy Cache storage - so we can cache the DoH response from the upstream
|
||||
proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m;
|
||||
|
||||
real_ip_header proxy_protocol;
|
||||
real_ip_recursive on;
|
||||
set_real_ip_from 10.10.0.10;
|
||||
real_ip_header proxy_protocol;
|
||||
real_ip_recursive on;
|
||||
set_real_ip_from 10.10.0.10;
|
||||
|
||||
server {
|
||||
listen 10.10.0.2:80 default_server;
|
||||
listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
|
||||
ssl_certificate /certs/self_public;
|
||||
ssl_certificate_key /certs/self_private;
|
||||
server {
|
||||
listen 80 default_server;
|
||||
|
||||
access_log /logs/nginx_default_access;
|
||||
|
||||
location / {
|
||||
root /app;
|
||||
index override.html login.html;
|
||||
try_files $uri $uri/ =404;
|
||||
location / {
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
location ~\.well-known {
|
||||
access_log /logs/nginx_certbot_access;
|
||||
root /certs/;
|
||||
try_files $uri =404;
|
||||
}
|
||||
}
|
||||
location /adguard/ {
|
||||
access_log /logs/nginx_adguard_access;
|
||||
proxy_pass http://ad:80/;
|
||||
proxy_redirect / /adguard/;
|
||||
proxy_cookie_path / /adguard/;
|
||||
|
||||
server {
|
||||
listen 10.10.0.2:443 ssl http2 proxy_protocol default_server;
|
||||
listen 10.10.1.2:443 ssl http2 default_server;
|
||||
ssl_certificate /certs/self_public;
|
||||
ssl_certificate_key /certs/self_private;
|
||||
|
||||
access_log /logs/nginx_ip_access;
|
||||
|
||||
location = / {
|
||||
root /app;
|
||||
try_files $uri /override.html @auth;
|
||||
}
|
||||
|
||||
location / {
|
||||
root /app;
|
||||
auth_basic "Restricted Content";
|
||||
auth_basic_user_file /app/.htpasswd;
|
||||
try_files $uri =404;
|
||||
}
|
||||
location @auth {
|
||||
root /app;
|
||||
auth_basic "Restricted Content";
|
||||
auth_basic_user_file /app/.htpasswd;
|
||||
try_files $uri =404;
|
||||
}
|
||||
|
||||
location /tlgrm {
|
||||
access_log /logs/nginx_tlgrm_access;
|
||||
proxy_pass http://php;
|
||||
}
|
||||
|
||||
location @php {
|
||||
proxy_pass http://php;
|
||||
}
|
||||
|
||||
location /adguard/ {
|
||||
}
|
||||
|
||||
location /webapp {
|
||||
access_log /logs/nginx_webapp_access;
|
||||
alias /app;
|
||||
index index.html;
|
||||
try_files $uri $uri/ @php;
|
||||
}
|
||||
|
||||
location /pac {
|
||||
access_log /logs/nginx_pac_access;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_pass http://php;
|
||||
}
|
||||
|
||||
location /ws {
|
||||
proxy_pass http://xr:443;
|
||||
proxy_redirect off;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_read_timeout 5d;
|
||||
}
|
||||
|
||||
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 /dns-query {
|
||||
access_log /logs/nginx_doh_access;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Connection "";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header X-Forwarded-Host $remote_addr;
|
||||
proxy_cache doh_cache;
|
||||
proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
proxy_pass https://ad/dns-query;
|
||||
}
|
||||
}
|
||||
location /webapp {
|
||||
access_log /logs/nginx_webapp_access;
|
||||
alias /app;
|
||||
index index.html;
|
||||
try_files $uri $uri/ /pac?$query_string;
|
||||
}
|
||||
location /pac {
|
||||
access_log /logs/nginx_pac_access;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_pass http://php;
|
||||
}
|
||||
location /tlgrm {
|
||||
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;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_read_timeout 5d;
|
||||
}
|
||||
#-ssl
|
||||
# # The DoH server block
|
||||
# location /dns-query {
|
||||
# access_log /logs/nginx_doh_access;
|
||||
# # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Connection "";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Proto https;
|
||||
# proxy_set_header X-Forwarded-For $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Host $remote_addr;
|
||||
|
||||
# # Enable Cache, and set the cache_key to include the request_body
|
||||
# proxy_cache doh_cache;
|
||||
# proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
#~
|
||||
|
||||
# # proxy pass to the dohloop upstream
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
#-ssl
|
||||
location ~\.well-known {
|
||||
access_log /logs/nginx_certbot_access;
|
||||
root /certs/;
|
||||
try_files $uri =404;
|
||||
}
|
||||
}
|
||||
#-domain
|
||||
# server {
|
||||
# server_name domain;
|
||||
# listen 10.10.0.2:443 ssl http2 proxy_protocol;
|
||||
# listen 10.10.1.2:443 ssl http2;
|
||||
# ssl_certificate /certs/cert_public;
|
||||
# ssl_certificate_key /certs/cert_private;
|
||||
|
||||
#~
|
||||
# access_log /logs/nginx_domain_access;
|
||||
|
||||
#-domain
|
||||
# server {
|
||||
# listen 10.10.0.2:80;
|
||||
# server_name ;
|
||||
#-domain
|
||||
#-ssl
|
||||
# listen 10.10.0.2:443 ssl http2 proxy_protocol;
|
||||
# listen 10.10.1.2:443 ssl http2;
|
||||
# ssl_certificate /certs/cert_public;
|
||||
# ssl_certificate_key /certs/cert_private;
|
||||
#-ssl
|
||||
# location = / {
|
||||
# root /app;
|
||||
# try_files $uri /override.html @auth;
|
||||
# }
|
||||
|
||||
#-domain
|
||||
# access_log /logs/nginx_domain_access;
|
||||
# location / {
|
||||
# root /app;
|
||||
# auth_basic "Restricted Content";
|
||||
# auth_basic_user_file /app/.htpasswd;
|
||||
# try_files $uri =404;
|
||||
# }
|
||||
# location @auth {
|
||||
# root /app;
|
||||
# auth_basic "Restricted Content";
|
||||
# auth_basic_user_file /app/.htpasswd;
|
||||
# try_files $uri =404;
|
||||
# }
|
||||
|
||||
# location / {
|
||||
# root /app;
|
||||
# index override.html login.html;
|
||||
# try_files $uri $uri/ =404;
|
||||
# }
|
||||
# location /adguard/ {
|
||||
# access_log /logs/nginx_adguard_access;
|
||||
# proxy_pass http://ad:80/;
|
||||
# proxy_redirect / /adguard/;
|
||||
# proxy_cookie_path / /adguard/;
|
||||
# }
|
||||
# location /webapp {
|
||||
# access_log /logs/nginx_webapp_access;
|
||||
# alias /app;
|
||||
# index index.html;
|
||||
# try_files $uri $uri/ /pac?$query_string;
|
||||
# }
|
||||
# location /pac {
|
||||
# access_log /logs/nginx_pac_access;
|
||||
# proxy_set_header Host $http_host;
|
||||
# proxy_pass http://php;
|
||||
# }
|
||||
# location ~\.well-known {
|
||||
# access_log /logs/nginx_certbot_access;
|
||||
# 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;
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Upgrade $http_upgrade;
|
||||
# proxy_set_header Connection "upgrade";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# proxy_read_timeout 5d;
|
||||
# }
|
||||
#-domain
|
||||
#-ssl
|
||||
# # The DoH server block
|
||||
# location /dns-query {
|
||||
# access_log /logs/nginx_doh_access;
|
||||
# # Proxy HTTP/1.1, clear the connection header to enable Keep-Alive
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Connection "";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Proto https;
|
||||
# proxy_set_header X-Forwarded-For $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Host $remote_addr;
|
||||
# location @php {
|
||||
# proxy_pass http://php;
|
||||
# }
|
||||
|
||||
# # Enable Cache, and set the cache_key to include the request_body
|
||||
# proxy_cache doh_cache;
|
||||
# proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
# location /adguard/ {
|
||||
# }
|
||||
|
||||
# # proxy pass to the dohloop upstream
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
#-ssl
|
||||
#-domain
|
||||
# }
|
||||
#-domain
|
||||
# location /webapp {
|
||||
# access_log /logs/nginx_webapp_access;
|
||||
# alias /app;
|
||||
# index index.html;
|
||||
# try_files $uri $uri/ @php;
|
||||
# }
|
||||
|
||||
# location /pac {
|
||||
# access_log /logs/nginx_pac_access;
|
||||
# proxy_set_header Host $http_host;
|
||||
# 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;
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Upgrade $http_upgrade;
|
||||
# proxy_set_header Connection "upgrade";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# proxy_read_timeout 5d;
|
||||
# }
|
||||
|
||||
# location /dns-query {
|
||||
# access_log /logs/nginx_doh_access;
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Connection "";
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Proto https;
|
||||
# proxy_set_header X-Forwarded-For $remote_addr;
|
||||
# proxy_set_header X-Forwarded-Host $remote_addr;
|
||||
# proxy_cache doh_cache;
|
||||
# proxy_cache_key $scheme$proxy_host$uri$is_args$args$request_body;
|
||||
# proxy_pass https://ad/dns-query;
|
||||
# }
|
||||
# }
|
||||
#-domain
|
||||
}
|
||||
|
||||
+1
-3
@@ -397,7 +397,7 @@ zend.exception_string_param_max_len = 0
|
||||
; threat in any way, but it makes it possible to determine whether you use PHP
|
||||
; on your server or not.
|
||||
; https://php.net/expose-php
|
||||
expose_php = On
|
||||
expose_php = Off
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;
|
||||
; Resource Limits ;
|
||||
@@ -1955,5 +1955,3 @@ opcache.enable=1
|
||||
opcache.jit_buffer_size=128M
|
||||
opcache.enable_cli=1
|
||||
pcre.jit=1
|
||||
|
||||
|
||||
|
||||
+11
-7
@@ -9,7 +9,7 @@
|
||||
"tag": "tun-in",
|
||||
"domain_strategy": "prefer_ipv4",
|
||||
"interface_name": "sing-tun",
|
||||
"inet4_address": "172.19.0.1\/30",
|
||||
"address": ["172.19.0.1\/30"],
|
||||
"mtu": 1400,
|
||||
"gso": true,
|
||||
"auto_route": true,
|
||||
@@ -110,12 +110,16 @@
|
||||
"protocol": "dns",
|
||||
"outbound": "dns-out"
|
||||
},
|
||||
{
|
||||
"addruleset": true,
|
||||
"outbound": "direct"
|
||||
},
|
||||
{
|
||||
"addruleset": true,
|
||||
"createruleset": [
|
||||
{
|
||||
"name": "pac",
|
||||
"interval": "15s",
|
||||
"interval": "30s",
|
||||
"rules": [
|
||||
{
|
||||
"domain_suffix": "~pac~"
|
||||
@@ -130,7 +134,7 @@
|
||||
"createruleset": [
|
||||
{
|
||||
"name": "package",
|
||||
"interval": "15s",
|
||||
"interval": "30s",
|
||||
"rules": [
|
||||
{
|
||||
"package_name": "~package~"
|
||||
@@ -145,7 +149,7 @@
|
||||
"createruleset": [
|
||||
{
|
||||
"name": "process",
|
||||
"interval": "15s",
|
||||
"interval": "30s",
|
||||
"rules": [
|
||||
{
|
||||
"process_name": "~process~"
|
||||
@@ -160,7 +164,7 @@
|
||||
"createruleset": [
|
||||
{
|
||||
"name": "block",
|
||||
"interval": "15s",
|
||||
"interval": "30s",
|
||||
"rules": [
|
||||
{
|
||||
"domain_suffix": "~block~"
|
||||
@@ -175,7 +179,7 @@
|
||||
"createruleset": [
|
||||
{
|
||||
"name": "warp",
|
||||
"interval": "15s",
|
||||
"interval": "30s",
|
||||
"rules": [
|
||||
{
|
||||
"domain_suffix": "~warp~"
|
||||
@@ -188,4 +192,4 @@
|
||||
],
|
||||
"final": "direct"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
"server_port": 8388,
|
||||
"local_address": "0.0.0.0",
|
||||
"local_port": 1080,
|
||||
"password": "test",
|
||||
"password": "",
|
||||
"timeout": 120,
|
||||
"method": "chacha20-ietf-poly1305",
|
||||
"no_delay": true,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"server": "0.0.0.0",
|
||||
"server_port": 8388,
|
||||
"password": "test",
|
||||
"password": "",
|
||||
"timeout": 120,
|
||||
"method": "chacha20-ietf-poly1305",
|
||||
"no_delay": true,
|
||||
|
||||
@@ -35,7 +35,7 @@ stream {
|
||||
map_hash_bucket_size 128;
|
||||
map $ssl_preread_server_name $sni_name {
|
||||
#domain
|
||||
telegram.org reality;
|
||||
t reality;
|
||||
#domain
|
||||
|
||||
#ocserv
|
||||
|
||||
+106
-81
@@ -4,92 +4,117 @@
|
||||
"error": "",
|
||||
"loglevel": "warning"
|
||||
},
|
||||
"inbounds": [{
|
||||
"tag": "socks",
|
||||
"port": 10808,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "socks",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": ["http", "tls"],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
}, {
|
||||
"tag": "http",
|
||||
"port": 10809,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "http",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": ["http", "tls"],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
}],
|
||||
"outbounds": [{
|
||||
"tag": "~outbound~",
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"vnext": [{
|
||||
"address": "~domain~",
|
||||
"port": 443,
|
||||
"users": [{
|
||||
"id": "~uid~",
|
||||
"alterId": 0,
|
||||
"email": "t@t.tt",
|
||||
"security": "auto",
|
||||
"encryption": "none",
|
||||
"flow": "xtls-rprx-vision"
|
||||
}]
|
||||
}]
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "reality",
|
||||
"realitySettings": {
|
||||
"serverName": "~server_name~",
|
||||
"fingerprint": "chrome",
|
||||
"show": false,
|
||||
"publicKey": "~public_key~",
|
||||
"shortId": "~short_id~",
|
||||
"spiderX": ""
|
||||
"inbounds": [
|
||||
{
|
||||
"tag": "socks",
|
||||
"port": 10808,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "socks",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": [
|
||||
"http",
|
||||
"tls"
|
||||
],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
},
|
||||
"mux": {
|
||||
"enabled": false,
|
||||
"concurrency": -1
|
||||
}
|
||||
}, {
|
||||
"tag": "direct",
|
||||
"protocol": "freedom"
|
||||
}, {
|
||||
"tag": "block",
|
||||
"protocol": "blackhole",
|
||||
"settings": {
|
||||
"response": {
|
||||
"type": "http"
|
||||
{
|
||||
"tag": "http",
|
||||
"port": 10809,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "http",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": [
|
||||
"http",
|
||||
"tls"
|
||||
],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
}
|
||||
}],
|
||||
],
|
||||
"outbounds": [
|
||||
{
|
||||
"tag": "direct",
|
||||
"protocol": "freedom"
|
||||
},
|
||||
{
|
||||
"tag": "~outbound~",
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"vnext": [
|
||||
{
|
||||
"address": "~domain~",
|
||||
"port": 443,
|
||||
"users": [
|
||||
{
|
||||
"id": "~uid~",
|
||||
"alterId": 0,
|
||||
"email": "t@t.tt",
|
||||
"security": "auto",
|
||||
"encryption": "none",
|
||||
"flow": "xtls-rprx-vision"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "reality",
|
||||
"realitySettings": {
|
||||
"serverName": "~server_name~",
|
||||
"fingerprint": "chrome",
|
||||
"show": false,
|
||||
"publicKey": "~public_key~",
|
||||
"shortId": "~short_id~",
|
||||
"spiderX": ""
|
||||
}
|
||||
},
|
||||
"mux": {
|
||||
"enabled": false,
|
||||
"concurrency": -1
|
||||
}
|
||||
},
|
||||
{
|
||||
"tag": "block",
|
||||
"protocol": "blackhole",
|
||||
"settings": {
|
||||
"response": {
|
||||
"type": "http"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"routing": {
|
||||
"domainStrategy": "AsIs",
|
||||
"rules": [{
|
||||
"type": "field",
|
||||
"outboundTag": "~outbound~",
|
||||
"domain": "~pac~"
|
||||
}, {
|
||||
"type": "field",
|
||||
"port": "0-65535",
|
||||
"outboundTag": "direct"
|
||||
}]
|
||||
"rules": [
|
||||
{
|
||||
"type": "field",
|
||||
"outboundTag": "block",
|
||||
"domain": "~block~"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"outboundTag": "~outbound~",
|
||||
"domain": "~pac~"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"outboundTag": "~outbound~",
|
||||
"domain": "~warp~"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
+44
-23
@@ -16,29 +16,21 @@
|
||||
"enabled": true
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"realitySettings": {
|
||||
"dest": "telegram.org:443",
|
||||
"maxClientVer": "",
|
||||
"maxTimeDiff": 0,
|
||||
"minClientVer": "",
|
||||
"privateKey": "",
|
||||
"serverNames": [
|
||||
"telegram.org"
|
||||
],
|
||||
"shortIds": [],
|
||||
"show": false,
|
||||
"xver": 0
|
||||
},
|
||||
"tcpSettings": {
|
||||
"acceptProxyProtocol": true
|
||||
},
|
||||
"sockopt": {
|
||||
"acceptProxyProtocol": true
|
||||
},
|
||||
"security": "reality"
|
||||
"network": "ws",
|
||||
"wsSettings": {
|
||||
"path": "/ws"
|
||||
}
|
||||
},
|
||||
"tag": "vless_tls"
|
||||
},
|
||||
{
|
||||
"listen": "127.0.0.1",
|
||||
"port": 8080,
|
||||
"protocol": "dokodemo-door",
|
||||
"settings": {
|
||||
"address": "127.0.0.1"
|
||||
},
|
||||
"tag": "api"
|
||||
}
|
||||
],
|
||||
"log": {
|
||||
@@ -57,6 +49,35 @@
|
||||
],
|
||||
"routing": {
|
||||
"domainStrategy": "AsIs",
|
||||
"rules": []
|
||||
"rules": [
|
||||
{
|
||||
"inboundTag": [
|
||||
"api"
|
||||
],
|
||||
"outboundTag": "api",
|
||||
"type": "field"
|
||||
}
|
||||
]
|
||||
},
|
||||
"stats": {},
|
||||
"api": {
|
||||
"services": [
|
||||
"StatsService"
|
||||
],
|
||||
"tag": "api"
|
||||
},
|
||||
"policy": {
|
||||
"levels": {
|
||||
"0": {
|
||||
"statsUserUplink": true,
|
||||
"statsUserDownlink": true
|
||||
}
|
||||
},
|
||||
"system": {
|
||||
"statsInboundUplink": true,
|
||||
"statsInboundDownlink": true,
|
||||
"statsOutboundUplink": true,
|
||||
"statsOutboundDownlink": true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+64
-74
@@ -96,7 +96,7 @@ services:
|
||||
ipv4_address: 10.10.1.2
|
||||
logging: *default-logging
|
||||
php:
|
||||
image: mercurykd/vpnbot-php:1.6
|
||||
image: mercurykd/vpnbot-php:1.7
|
||||
build:
|
||||
dockerfile: dockerfile/php.dockerfile
|
||||
args:
|
||||
@@ -164,6 +164,7 @@ services:
|
||||
- ./update:/update
|
||||
- ./.git:/.git
|
||||
- ./scripts/start_service.sh:/start_service.sh
|
||||
- ./docker-compose.override.yml:/docker/compose
|
||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||
environment:
|
||||
IP: ${IP}
|
||||
@@ -187,45 +188,15 @@ 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
|
||||
- proxy
|
||||
- ss
|
||||
wg:
|
||||
image: mercurykd/vpnbot-wg:1.1
|
||||
build:
|
||||
@@ -247,8 +218,6 @@ services:
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
ports:
|
||||
- ${WGPORT}:${WGPORT}/udp
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
@@ -287,8 +256,6 @@ services:
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
ports:
|
||||
- ${WG1PORT}:${WG1PORT}/udp
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
@@ -307,13 +274,11 @@ services:
|
||||
ipv4_address: 10.10.0.14
|
||||
logging: *default-logging
|
||||
ad:
|
||||
image: mercurykd/vpnbot-ad:1.2
|
||||
image: mercurykd/vpnbot-ad:1.3
|
||||
build:
|
||||
dockerfile: dockerfile/adguard.dockerfile
|
||||
args:
|
||||
image: ${IMAGE}
|
||||
ports:
|
||||
- 853:853
|
||||
volumes:
|
||||
- ./config/.profile:/root/.ashrc:ro
|
||||
- type: volume
|
||||
@@ -343,37 +308,6 @@ services:
|
||||
- NET_ADMIN
|
||||
entrypoint: ["/bin/sh", "/start_ad.sh"]
|
||||
logging: *default-logging
|
||||
ss:
|
||||
image: mercurykd/vpnbot-ss:1.2
|
||||
build:
|
||||
dockerfile: dockerfile/shadowsocks.dockerfile
|
||||
args:
|
||||
image: ${IMAGE}
|
||||
volumes:
|
||||
- ./config/.profile:/root/.ashrc:ro
|
||||
- ./config/ssserver.json:/config.json
|
||||
- ./ssh:/ssh
|
||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||
- ./scripts/start_ss.sh:/start_ss.sh
|
||||
hostname: shadowsocks
|
||||
container_name: shadowsocks-${VER}
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
ports:
|
||||
- ${SSPORT}:${SSPORT}/tcp
|
||||
- ${SSPORT}:${SSPORT}/udp
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_ss.sh"]
|
||||
networks:
|
||||
default:
|
||||
ipv4_address: 10.10.0.6
|
||||
logging: *default-logging
|
||||
tg:
|
||||
image: mercurykd/vpnbot-tg:1.1
|
||||
build:
|
||||
@@ -389,8 +323,6 @@ services:
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
ports:
|
||||
- ${TGPORT}:${TGPORT}
|
||||
environment:
|
||||
IP: ${IP}
|
||||
env_file:
|
||||
@@ -405,7 +337,7 @@ services:
|
||||
ipv4_address: 10.10.0.8
|
||||
logging: *default-logging
|
||||
xr:
|
||||
image: mercurykd/vpnbot-xr:1.3
|
||||
image: mercurykd/vpnbot-xr:1.4
|
||||
build:
|
||||
dockerfile: dockerfile/xray.dockerfile
|
||||
args:
|
||||
@@ -533,3 +465,61 @@ services:
|
||||
default:
|
||||
ipv4_address: 10.10.0.13
|
||||
logging: *default-logging
|
||||
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
|
||||
ss:
|
||||
image: mercurykd/vpnbot-ss:1.2
|
||||
build:
|
||||
dockerfile: dockerfile/shadowsocks.dockerfile
|
||||
args:
|
||||
image: ${IMAGE}
|
||||
volumes:
|
||||
- ./config/.profile:/root/.ashrc:ro
|
||||
- ./config/ssserver.json:/config.json
|
||||
- ./ssh:/ssh
|
||||
- ./config/sshd_config:/etc/ssh/sshd_config
|
||||
- ./scripts/start_ss.sh:/start_ss.sh
|
||||
hostname: shadowsocks
|
||||
container_name: shadowsocks-${VER}
|
||||
depends_on:
|
||||
php:
|
||||
condition: service_healthy
|
||||
env_file:
|
||||
- path: ./.env
|
||||
required: true # default
|
||||
- path: ./override.env
|
||||
required: false
|
||||
stop_grace_period: 1s
|
||||
command: ["/bin/sh", "/start_ss.sh"]
|
||||
networks:
|
||||
default:
|
||||
ipv4_address: 10.10.0.6
|
||||
logging: *default-logging
|
||||
|
||||
+12
-11
@@ -22,16 +22,17 @@ RUN apk add --no-cache --update php81 \
|
||||
curl \
|
||||
git \
|
||||
py3-qt5 \
|
||||
&& wget https://github.com/ameshkov/dnslookup/releases/download/v1.9.1/dnslookup-linux-amd64-v1.9.1.tar.gz \
|
||||
&& tar -xf dnslookup-linux-amd64-v1.9.1.tar.gz \
|
||||
&& mkdir /root/.ssh \
|
||||
&& wget https://github.com/ameshkov/dnslookup/releases/download/v1.11.1/dnslookup-linux-amd64-v1.11.1.tar.gz \
|
||||
&& tar -xf dnslookup-linux-amd64-v1.11.1.tar.gz \
|
||||
&& mv linux-amd64/dnslookup /usr/bin \
|
||||
&& rm dnslookup-linux-amd64-v1.9.1.tar.gz \
|
||||
&& rm dnslookup-linux-amd64-v1.11.1.tar.gz \
|
||||
&& 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
|
||||
RUN apk add openssh \
|
||||
&& mkdir /root/.ssh
|
||||
ENV ENV="/root/.ashrc"
|
||||
&& wget https://github.com/SagerNet/sing-box/releases/download/v1.10.3/sing-box-1.10.3-linux-amd64.tar.gz \
|
||||
&& tar -xf sing-box-1.10.3-linux-amd64.tar.gz \
|
||||
&& mv sing-box-1.10.3-linux-amd64/sing-box /usr/bin \
|
||||
&& rm sing-box-1.10.3-linux-amd64.tar.gz \
|
||||
&& rm -rf /sing-box-1.10.3-linux-amd64 \
|
||||
&& wget https://github.com/MetaCubeX/mihomo/releases/download/v1.18.10/mihomo-linux-amd64-v1.18.10.gz \
|
||||
&& gunzip mihomo-linux-amd64-v1.18.10.gz \
|
||||
&& mv mihomo-linux-amd64-v1.18.10 /usr/bin/mihomo
|
||||
@@ -1,82 +1,20 @@
|
||||
telegram bot to manage servers (inside the bot)
|
||||
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/d5a81237-5215-41db-87e5-20734120cc9c" width="200">
|
||||
|
||||
### XTLS-Reality
|
||||
- change secret
|
||||
- qr/config
|
||||
- change fake domain
|
||||
- multiple users
|
||||
- subscriptions with routing
|
||||
- routing templates per user
|
||||
- steal from yourself
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/39bdf4e0-96a6-4257-b61e-30a14122e236" width="200">
|
||||
|
||||
### NaiveProxy
|
||||
- change login
|
||||
- change password
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/2127a4af-0436-452c-bfe2-c750dd5dbc06" width="200">
|
||||
|
||||
### OpenConnect
|
||||
- change secret
|
||||
- change password
|
||||
- change dns
|
||||
- add user
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/a4ffc04f-965a-439b-862b-210b98e1f87d" width="200">
|
||||
|
||||
### Wireguard / Amnezia
|
||||
- create
|
||||
- delete
|
||||
- rename
|
||||
- timer
|
||||
- torrent blocking
|
||||
- qr/config
|
||||
- statistics
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/51a79c93-8083-40ba-a14b-a6ef19f00531" width="200">
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/fd6ffd9f-bd75-479c-8dca-ea6c0b938b6c" width="200">
|
||||
|
||||
### Shadowsocks + v2ray
|
||||
- change password
|
||||
- on/off v2ray
|
||||
- qr
|
||||
- short link
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/fbe39617-63ae-4536-8ab0-e4269ed8784a" width="200">
|
||||
|
||||
### AdguardHome
|
||||
- change password
|
||||
- change upstream dns
|
||||
- check dns
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/a7d4ba52-494b-429f-a3e2-08c68c8353c4" width="200">
|
||||
|
||||
### PAC
|
||||
- the ability to create your own PAC available by url with the ability to substitute the final ip and port
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/5343e009-1b21-450f-918d-b811b98a0549" width="200">
|
||||
|
||||
### MTProto
|
||||
- change secret
|
||||
- qr/config
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/411696d8-172a-4dac-b6b7-4a6da3adfab2" width="200">
|
||||
|
||||
### Settings
|
||||
- add/change admin
|
||||
- change language (en/ru)
|
||||
- import/export all settings
|
||||
- domain binding
|
||||
- obtain ssl for domain
|
||||
<img src="https://github.com/mercurykd/vpnbot/assets/30900414/431ec09d-9c14-4c74-b8f6-e49c142132e8" width="200">
|
||||
- VLESS (Reality OR Websocket)
|
||||
- NaiveProxy
|
||||
- OpenConnect
|
||||
- Wireguard
|
||||
- Amnezia
|
||||
- AdguardHome
|
||||
- MTProto
|
||||
- PAC
|
||||
- automatic ssl
|
||||
|
||||
---
|
||||
environment: ubuntu 18.04/20.04/22.04, debian 11/12
|
||||
environment: ubuntu 22.04/24.04, debian 11/12
|
||||
|
||||
### Install:
|
||||
|
||||
```shell
|
||||
wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY
|
||||
```
|
||||
|
||||
### Install as service (autoload on start):
|
||||
|
||||
```shell
|
||||
cd /root/vpnbot
|
||||
bash scripts/install_as_service.sh
|
||||
wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY master
|
||||
```
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
TAG="${2:-master}"
|
||||
apt update
|
||||
apt install -y \
|
||||
ca-certificates \
|
||||
@@ -13,6 +14,7 @@ apt install -y \
|
||||
curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
|
||||
git clone https://github.com/mercurykd/vpnbot.git
|
||||
cd ./vpnbot
|
||||
git checkout $TAG
|
||||
echo "<?php
|
||||
|
||||
\$c = ['key' => '$1'];" > ./app/config.php
|
||||
|
||||
Binary file not shown.
+11
-2
@@ -1,5 +1,14 @@
|
||||
#!/bin/bash
|
||||
pwd=`pwd`
|
||||
process_name="$pwd/update/update.sh"
|
||||
current_pid=$$
|
||||
pids=$(pgrep -f $process_name)
|
||||
for pid in $pids; do
|
||||
if [ $pid -ne $current_pid ]; then
|
||||
kill -9 $pid
|
||||
fi
|
||||
done
|
||||
|
||||
> $pwd/update/pipe
|
||||
echo "$$" > $pwd/update/update_pid
|
||||
|
||||
@@ -27,10 +36,10 @@ do
|
||||
git pull > ./update/message
|
||||
fi
|
||||
curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "launching the bot"/')"
|
||||
IP=$(curl ipinfo.io/ip) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
|
||||
bash $pwd/update/update.sh &
|
||||
> $pwd/update/key
|
||||
> $pwd/update/curl
|
||||
IP=$(curl -s -t 1 2ip.io || curl -s -t 1 ipinfo.io/ip || curl -s -t 1 ifconfig.me) VER=$(git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
|
||||
bash $pwd/update/update.sh &
|
||||
exit 0
|
||||
fi
|
||||
sleep 1
|
||||
|
||||
@@ -1,3 +1,55 @@
|
||||
18.01.2025 v2.5
|
||||
- фикс скачивания шаблона михомо
|
||||
- обновлен singbox.exe
|
||||
- вывод статистики vless пользователей
|
||||
- смягчил паттерн поиска reality degenerate в логах
|
||||
07.01.2025 v2.4
|
||||
- вернул shadowsocks (спасибо за донат)
|
||||
04.01.2025
|
||||
- возможность установить нужную версию с нуля
|
||||
- корректировка автосканера под новую версию
|
||||
- улучшение основного меню
|
||||
26.12.2024 v2.2
|
||||
- возможность менять поддомен для naive/openconnect
|
||||
26.12.2024 v2.1
|
||||
- обновление версии singbox и конфига под него
|
||||
22.12.2024 v2.0
|
||||
!!! версия не совместима с предыдущими, возможно прийдется накатывать руками. старые конфиги (кроме вг) не будут работать! перед обновлением:
|
||||
- включить все порты или удалить docker-compose.override.yml
|
||||
- переключить vless на вебсокет
|
||||
- запустить обновление, если бот запуститься:
|
||||
- перевыпустить сертификаты
|
||||
- все ссылки на конфиги будут новыми (старые не будут работать)
|
||||
- переключить vless на нужный режим (передернуть тумблер)
|
||||
- включить нужные вам порты (по умолчанию включено только 80 и 443)
|
||||
|
||||
что нового:
|
||||
- по умолчанию включены только 80, 443 порты
|
||||
- у каждого инстанса бота теперь индивидуальные ссылки и поддомены
|
||||
- отключены заголовки в ответах по которым можно было идентифицировать бота
|
||||
- стандартная заглушка на главной заменена на basic auth. если есть override.html - то покажет его
|
||||
- любая ссылка 'не по адресам бота' выдает непроходимый basic auth
|
||||
- поддомены np и oc теперь у каждого индивидуальные
|
||||
- выпилен shadowsocks (10.10.0.3 прокси теперь нет)
|
||||
- добавлен direct rule в origin-singbox шаблон
|
||||
- заменены значки для silence mode анализатора логов
|
||||
- переработано главное меню аля дашбоард
|
||||
- куча отрефакторенного кода - возможны баги
|
||||
|
||||
19.12.2024 v1.115
|
||||
- генерация устойчивого пароля shadowsocks, если он равен test или пуст
|
||||
19.12.2024 v1.114
|
||||
- убран дефолтный пароль у shadowsocks
|
||||
13.12.2024 v1.113
|
||||
- обновлен adguardHome
|
||||
- фикс краша adg при удалении dns-upstream из бота
|
||||
10.12.2024 v1.112
|
||||
- mihomo: встроенные списки теперь отдаются через rule-providers(т.е подгружаются ядром без обновления конфига)
|
||||
- обновлены ядра
|
||||
09.12.2024 v1.111
|
||||
- mihomo: фикс rule-providers format
|
||||
06.12.2024 v1.110
|
||||
- ruleset для mihomo
|
||||
28.11.2024 v1.109
|
||||
- фикс автоскана
|
||||
- добавление clash-шаблонов
|
||||
|
||||
Reference in New Issue
Block a user