This commit is contained in:
2025-10-01 11:58:01 +03:00
parent f563ab1216
commit 0f2fb9246e
7 changed files with 21 additions and 149 deletions
+1 -1
View File
@@ -67,7 +67,7 @@ let
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"z /mnt/services 0755 root root -" "z ${xlib.dirs.services-mnt-folder} 0755 root root -"
]; ];
services = { services = {
-72
View File
@@ -1,72 +0,0 @@
{
config,
lib,
pkgs,
xlib,
...
}:
{
services = {
cloudflared = {
enable = false;
certificateFile = "${xlib.dirs.server-credentials}/cloudflared/cert.pem";
tunnels = {
"58b340ee-e98a-4af9-b786-74600c71f49e" = {
credentialsFile = "${xlib.dirs.server-credentials}/cloudflared/server.json";
warp-routing.enabled = true;
ingress = {
"immich.zeroq.ru" = {
service = "http://localhost:2283";
};
"nextcloud.zeroq.ru" = {
service = "http://localhost:10000";
};
};
default = "http_status:404";
};
# "58b340ee-e98a-4af9-b786-74600c71f49e" = {
# credentialsFile = "${xlib.dirs.server-credentials}/cloudflared/server.json";
# warp-routing.enabled = true;
# ingress = {
# "nextcloud.zeroq.ru" = {
# service = "http://localhost:10000";
# };
# };
# default = "http_status:404";
# };
};
};
};
# users.users = {
# cloudflared = {
# group = "cloudflared";
# isSystemUser = true;
# };
# };
# users.groups.cloudflared = { };
#
# systemd.services.cloudflared = {
# after = [
# "network.target"
# "network-online.target"
# ];
# wants = [
# "network.target"
# "network-online.target"
# ];
# wantedBy = [ "multi-user.target" ];
# serviceConfig = {
# ExecStart = "${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate --config=${xlib.dirs.server-credentials}/cloudflared/config.yaml --origincert=${xlib.dirs.server-credentials}/cloudflared/cert.pem --credentials-file=${xlib.dirs.server-credentials}/cloudflared/server.json run";
# Group = "root";
# User = "root";
# Restart = "on-failure";
# };
# };
environment = {
systemPackages = with pkgs; [
cloudflared
];
};
}
-1
View File
@@ -21,6 +21,5 @@
# ./open-webui.nix # ./open-webui.nix
# ./trilium.nix # ./trilium.nix
# ./zerotier.nix # ./zerotier.nix
#./cloudflared.nix
]; ];
} }
+7
View File
@@ -8,5 +8,12 @@
{ {
services.node-red = { services.node-red = {
enable = true; enable = true;
port = 1880;
openFirewall = true;
userDir = "${xlib.dirs.services-mnt-folder}/node-red";
}; };
systemd.tmpfiles.rules = [
"z ${xlib.dirs.services-mnt-folder}/node-red 0750 node-red node-red -"
];
} }
-74
View File
@@ -1,74 +0,0 @@
{
config,
pkgs,
inputs,
...
}:
{
services = {
cloudflared = {
enable = false;
certificateFile = "${inputs.zeroq-credentials}/services/cloudflared/cert.pem";
tunnels = {
"58b340ee-e98a-4af9-b786-74600c71f49e" = {
credentialsFile = "${inputs.zeroq-credentials}/services/cloudflared/server.json";
warp-routing.enabled = true;
ingress = {
"immich.zeroq.ru" = {
service = "http://sapphira.latxa-platy.ts.net:2283";
};
"nextcloud.zeroq.ru" = {
service = "http://sapphira.latxa-platy.ts.net:10000";
};
"llm.zeroq.ru" = {
service = "http://atoridu.latxa-platy.ts.net:11111";
};
};
default = "http_status:404";
};
# "58b340ee-e98a-4af9-b786-74600c71f49e" = {
# credentialsFile = "${inputs.zeroq.dirs.server-credentials}/cloudflared/server.json";
# warp-routing.enabled = true;
# ingress = {
# "nextcloud.zeroq.ru" = {
# service = "http://localhost:10000";
# };
# };
# default = "http_status:404";
# };
};
};
};
# users.users = {
# cloudflared = {
# group = "cloudflared";
# isSystemUser = true;
# };
# };
# users.groups.cloudflared = { };
#
# systemd.services.cloudflared = {
# after = [
# "network.target"
# "network-online.target"
# ];
# wants = [
# "network.target"
# "network-online.target"
# ];
# wantedBy = [ "multi-user.target" ];
# serviceConfig = {
# ExecStart = "${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate --config=${inputs.zeroq.dirs.server-credentials}/cloudflared/config.yaml --origincert=${inputs.zeroq.dirs.server-credentials}/cloudflared/cert.pem --credentials-file=${inputs.zeroq.dirs.server-credentials}/cloudflared/server.json run";
# Group = "root";
# User = "root";
# Restart = "on-failure";
# };
# };
environment = {
systemPackages = with pkgs; [
cloudflared
];
};
}
+1 -1
View File
@@ -5,7 +5,7 @@
{ {
imports = [ imports = [
./docker.nix ./docker.nix
./netbird.nix # ./netbird.nix
./nginx.nix ./nginx.nix
./xray.nix ./xray.nix
]; ];
+12
View File
@@ -16,6 +16,18 @@ in
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts = { virtualHosts = {
"node-red.zeroq.ru" = {
forceSSL = true;
enableACME = true;
kTLS = true;
locations."/" = {
proxyPass = "http://${server}:1880";
proxyWebsockets = true;
};
extraConfig = ''
client_max_body_size 5G;
'';
};
"flux.zeroq.ru" = { "flux.zeroq.ru" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;