From d5c5b93cb0ce0f17c31733de1b91ef3b5bc08464 Mon Sep 17 00:00:00 2001 From: oqyude Date: Sat, 2 Aug 2025 22:17:11 +0300 Subject: [PATCH] test --- modules/vds/cloudflared.nix | 2 +- modules/vds/nginx.nix | 54 +++++++++++++++++++++---------------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/modules/vds/cloudflared.nix b/modules/vds/cloudflared.nix index 3e71ec9..0c7f947 100755 --- a/modules/vds/cloudflared.nix +++ b/modules/vds/cloudflared.nix @@ -8,7 +8,7 @@ { services = { cloudflared = { - enable = true; + enable = false; certificateFile = "${inputs.zeroq-credentials}/services/cloudflared/cert.pem"; tunnels = { "58b340ee-e98a-4af9-b786-74600c71f49e" = { diff --git a/modules/vds/nginx.nix b/modules/vds/nginx.nix index f370658..bd593b4 100755 --- a/modules/vds/nginx.nix +++ b/modules/vds/nginx.nix @@ -8,39 +8,47 @@ { services = { nginx = { - enable = false; + enable = true; recommendedGzipSettings = true; recommendedOptimisation = true; recommendedProxySettings = true; recommendedTlsSettings = true; virtualHosts = { - "vless-sub" = { - - serverName = "${inputs.zeroq.devices.vds.hostname}.latxa-platy.ts.net"; + "immich.zeroq.ru" = { listen = [ { - addr = "0.0.0.0"; # Tailscale IP вашего VDS - port = 44444; - ssl = false; - } - { - addr = "0.0.0.0"; # Tailscale IP вашего VDS - port = 44443; - ssl = true; + addr = "100.64.0.0"; + port = 2283; } ]; - root = "${inputs.zeroq-credentials.paths.vless-subs.root}"; # "${inputs.zeroq-credentials}/services/xray/subs"; - locations."/" = { - extraConfig = '' - if ($scheme = http) { - return 301 https://$host:44443$request_uri; - } - ''; - }; - enableACME = true; - forceSSL = true; # Принудительно HTTPS - }; + # "vless-sub" = { + + # serverName = "${inputs.zeroq.devices.vds.hostname}.latxa-platy.ts.net"; + # listen = [ + # { + # addr = "0.0.0.0"; # Tailscale IP вашего VDS + # port = 44444; + # ssl = false; + # } + # { + # addr = "0.0.0.0"; # Tailscale IP вашего VDS + # port = 44443; + # ssl = true; + # } + # ]; + # root = "${inputs.zeroq-credentials.paths.vless-subs.root}"; # "${inputs.zeroq-credentials}/services/xray/subs"; + # locations."/" = { + # extraConfig = '' + # if ($scheme = http) { + # return 301 https://$host:44443$request_uri; + # } + # ''; + # }; + # enableACME = true; + # forceSSL = true; # Принудительно HTTPS + + # }; }; }; };