nix machine / user configurations

make website be served on ptr.pet and poor.dog also

ptr.pet 9c7bf2e9 885389ce

verified
Changed files
+32 -26
_sources
hosts
trimounts
modules
+3 -3
_sources/generated.json
···
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
-
"rev": "f79ac2a83647e8535511e33feb32fe5525f3ea74",
-
"sha256": "sha256-6WHoN48jfXJy95E/NHCBD6QdHLEXE6dsxtGAWsz3s4w=",
+
"rev": "00bc18c0a7c74fcf3a8f0ede70e5ee3f3f7d7797",
+
"sha256": "sha256-4TbxOa4V13/WspjKyfKDguKoIDVKRogOa+Rl0bSg2/U=",
"sparseCheckout": [],
"type": "git",
"url": "https://tangled.org/@ptr.pet/endpoint"
},
-
"version": "f79ac2a83647e8535511e33feb32fe5525f3ea74"
+
"version": "00bc18c0a7c74fcf3a8f0ede70e5ee3f3f7d7797"
},
"clickee-proxy": {
"cargoLocks": null,
+3 -3
_sources/generated.nix
···
};
blog = {
pname = "blog";
-
version = "f79ac2a83647e8535511e33feb32fe5525f3ea74";
+
version = "00bc18c0a7c74fcf3a8f0ede70e5ee3f3f7d7797";
src = fetchgit {
url = "https://tangled.org/@ptr.pet/endpoint";
-
rev = "f79ac2a83647e8535511e33feb32fe5525f3ea74";
+
rev = "00bc18c0a7c74fcf3a8f0ede70e5ee3f3f7d7797";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ ];
-
sha256 = "sha256-6WHoN48jfXJy95E/NHCBD6QdHLEXE6dsxtGAWsz3s4w=";
+
sha256 = "sha256-4TbxOa4V13/WspjKyfKDguKoIDVKRogOa+Rl0bSg2/U=";
};
date = "2025-12-01";
};
+26 -20
hosts/trimounts/modules/website.nix
···
gazesys-modules = modules;
};
port = 3003;
+
vhostConfig = {
+
locations."/".proxyPass = "http://localhost:${toString port}";
+
locations."/annoy/ws/" = {
+
proxyWebsockets = true;
+
proxyPass = "http://100.64.0.9:3111/";
+
extraConfig = ''
+
rewrite ^/annoy/ws/(.*) /$1 break;
+
'';
+
};
+
locations."/annoy/ws" = {
+
proxyWebsockets = true;
+
proxyPass = "http://100.64.0.9:3111/";
+
extraConfig = ''
+
rewrite ^/annoy/ws(.*) /$1 break;
+
'';
+
};
+
};
in
{
users.users.website = {
···
# Unit = "annoy-keep-alive.service";
# };
-
services.nginx.virtualHosts."gaze.systems" = {
-
locations."/".proxyPass = "http://localhost:${toString port}";
-
locations."/annoy/ws/" = {
-
proxyWebsockets = true;
-
proxyPass = "http://100.64.0.9:3111/";
-
extraConfig = ''
-
rewrite ^/annoy/ws/(.*) /$1 break;
-
'';
-
};
-
locations."/annoy/ws" = {
-
proxyWebsockets = true;
-
proxyPass = "http://100.64.0.9:3111/";
-
extraConfig = ''
-
rewrite ^/annoy/ws(.*) /$1 break;
-
'';
-
};
-
};
+
services.nginx.virtualHosts."gaze.systems" = vhostConfig;
+
services.nginx.virtualHosts."ptr.pet" = vhostConfig;
+
services.nginx.virtualHosts."poor.dog" = vhostConfig;
-
services.nginx.virtualHosts."poor.dog" = {
-
locations."/".return = "301 https://gaze.systems$request_uri";
-
};
+
# services.nginx.virtualHosts."poor.dog" = {
+
# locations."=/".return = "301 https://gaze.systems$request_uri";
+
# };
+
# services.nginx.virtualHosts."ptr.pet" = {
+
# locations."=/".return = "301 https://gaze.systems$request_uri";
+
# };
}