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
··· 32 "fetchSubmodules": false, 33 "leaveDotGit": false, 34 "name": null, 35 - "rev": "f79ac2a83647e8535511e33feb32fe5525f3ea74", 36 - "sha256": "sha256-6WHoN48jfXJy95E/NHCBD6QdHLEXE6dsxtGAWsz3s4w=", 37 "sparseCheckout": [], 38 "type": "git", 39 "url": "https://tangled.org/@ptr.pet/endpoint" 40 }, 41 - "version": "f79ac2a83647e8535511e33feb32fe5525f3ea74" 42 }, 43 "clickee-proxy": { 44 "cargoLocks": null,
··· 32 "fetchSubmodules": false, 33 "leaveDotGit": false, 34 "name": null, 35 + "rev": "00bc18c0a7c74fcf3a8f0ede70e5ee3f3f7d7797", 36 + "sha256": "sha256-4TbxOa4V13/WspjKyfKDguKoIDVKRogOa+Rl0bSg2/U=", 37 "sparseCheckout": [], 38 "type": "git", 39 "url": "https://tangled.org/@ptr.pet/endpoint" 40 }, 41 + "version": "00bc18c0a7c74fcf3a8f0ede70e5ee3f3f7d7797" 42 }, 43 "clickee-proxy": { 44 "cargoLocks": null,
+3 -3
_sources/generated.nix
··· 15 }; 16 blog = { 17 pname = "blog"; 18 - version = "f79ac2a83647e8535511e33feb32fe5525f3ea74"; 19 src = fetchgit { 20 url = "https://tangled.org/@ptr.pet/endpoint"; 21 - rev = "f79ac2a83647e8535511e33feb32fe5525f3ea74"; 22 fetchSubmodules = false; 23 deepClone = false; 24 leaveDotGit = false; 25 sparseCheckout = [ ]; 26 - sha256 = "sha256-6WHoN48jfXJy95E/NHCBD6QdHLEXE6dsxtGAWsz3s4w="; 27 }; 28 date = "2025-12-01"; 29 };
··· 15 }; 16 blog = { 17 pname = "blog"; 18 + version = "00bc18c0a7c74fcf3a8f0ede70e5ee3f3f7d7797"; 19 src = fetchgit { 20 url = "https://tangled.org/@ptr.pet/endpoint"; 21 + rev = "00bc18c0a7c74fcf3a8f0ede70e5ee3f3f7d7797"; 22 fetchSubmodules = false; 23 deepClone = false; 24 leaveDotGit = false; 25 sparseCheckout = [ ]; 26 + sha256 = "sha256-4TbxOa4V13/WspjKyfKDguKoIDVKRogOa+Rl0bSg2/U="; 27 }; 28 date = "2025-12-01"; 29 };
+26 -20
hosts/trimounts/modules/website.nix
··· 14 gazesys-modules = modules; 15 }; 16 port = 3003; 17 in 18 { 19 users.users.website = { ··· 61 # Unit = "annoy-keep-alive.service"; 62 # }; 63 64 - services.nginx.virtualHosts."gaze.systems" = { 65 - locations."/".proxyPass = "http://localhost:${toString port}"; 66 - locations."/annoy/ws/" = { 67 - proxyWebsockets = true; 68 - proxyPass = "http://100.64.0.9:3111/"; 69 - extraConfig = '' 70 - rewrite ^/annoy/ws/(.*) /$1 break; 71 - ''; 72 - }; 73 - locations."/annoy/ws" = { 74 - proxyWebsockets = true; 75 - proxyPass = "http://100.64.0.9:3111/"; 76 - extraConfig = '' 77 - rewrite ^/annoy/ws(.*) /$1 break; 78 - ''; 79 - }; 80 - }; 81 82 - services.nginx.virtualHosts."poor.dog" = { 83 - locations."/".return = "301 https://gaze.systems$request_uri"; 84 - }; 85 }
··· 14 gazesys-modules = modules; 15 }; 16 port = 3003; 17 + vhostConfig = { 18 + locations."/".proxyPass = "http://localhost:${toString port}"; 19 + locations."/annoy/ws/" = { 20 + proxyWebsockets = true; 21 + proxyPass = "http://100.64.0.9:3111/"; 22 + extraConfig = '' 23 + rewrite ^/annoy/ws/(.*) /$1 break; 24 + ''; 25 + }; 26 + locations."/annoy/ws" = { 27 + proxyWebsockets = true; 28 + proxyPass = "http://100.64.0.9:3111/"; 29 + extraConfig = '' 30 + rewrite ^/annoy/ws(.*) /$1 break; 31 + ''; 32 + }; 33 + }; 34 in 35 { 36 users.users.website = { ··· 78 # Unit = "annoy-keep-alive.service"; 79 # }; 80 81 + services.nginx.virtualHosts."gaze.systems" = vhostConfig; 82 + services.nginx.virtualHosts."ptr.pet" = vhostConfig; 83 + services.nginx.virtualHosts."poor.dog" = vhostConfig; 84 85 + # services.nginx.virtualHosts."poor.dog" = { 86 + # locations."=/".return = "301 https://gaze.systems$request_uri"; 87 + # }; 88 + # services.nginx.virtualHosts."ptr.pet" = { 89 + # locations."=/".return = "301 https://gaze.systems$request_uri"; 90 + # }; 91 }