diff --git a/secret.nix b/secret.nix index 615d97c..2c0a5d2 100644 --- a/secret.nix +++ b/secret.nix @@ -10,6 +10,7 @@ let privateKey = mkOption { type = types.str; default = ""; }; shortId = mkOption { type = types.str; default = ""; }; spiderX = mkOption { type = types.str; default = "/"; }; + sni = mkOption { type = types.str; default = "/"; }; }; affine-config = with lib; { env = { diff --git a/servers/artemisia/main.nix b/servers/artemisia/main.nix index 9ae7e9d..7f8aa8d 100644 --- a/servers/artemisia/main.nix +++ b/servers/artemisia/main.nix @@ -29,6 +29,7 @@ privateKey = secret.marzban.privateKey; shortId = secret.marzban.shortId; spiderX = secret.marzban.spiderX; + sni = secret.marzban.sni; }; }; diff --git a/servers/common/xray.nix b/servers/common/xray.nix index 999cf5f..f3940fc 100644 --- a/servers/common/xray.nix +++ b/servers/common/xray.nix @@ -1,4 +1,4 @@ -{ server-domain, port, dest, privateKey, shortId, spiderX }: +{ server-domain, port, dest, privateKey, shortId, spiderX, sni }: { log.loglevel = "warning"; @@ -34,7 +34,7 @@ dest = dest; xver = 0; serverNames = [ - server-domain + sni ]; privateKey = privateKey; SpiderX = spiderX; diff --git a/servers/mio/main.nix b/servers/mio/main.nix index 34c4659..684b0d7 100644 --- a/servers/mio/main.nix +++ b/servers/mio/main.nix @@ -42,6 +42,7 @@ privateKey = secret.marzban.privateKey; shortId = secret.marzban.shortId; spiderX = secret.marzban.spiderX; + sni = secret.marzban.sni; }; }; diff --git a/servers/vanessa/main.nix b/servers/vanessa/main.nix index a5d9334..b1ed2dc 100644 --- a/servers/vanessa/main.nix +++ b/servers/vanessa/main.nix @@ -24,6 +24,7 @@ privateKey = secret.marzban.privateKey; shortId = secret.marzban.shortId; spiderX = secret.marzban.spiderX; + sni = secret.marzban.sni; }; }; diff --git a/servers/vanessa/nginx.nix b/servers/vanessa/nginx.nix index 1ca9108..7a29989 100644 --- a/servers/vanessa/nginx.nix +++ b/servers/vanessa/nginx.nix @@ -15,10 +15,6 @@ default marzban; } - upstream git { - server 127.0.0.1:444; - } - upstream marzban { server 127.0.0.1:1080; } @@ -30,7 +26,7 @@ ssl_preread on; proxy_connect_timeout 30s; proxy_timeout 1h; - proxy_buffer_size 64k; + proxy_buffer_size 16k; } ''; };