Compare commits

...

8 Commits

6 changed files with 80 additions and 58 deletions

52
flake.lock generated
View File

@@ -89,11 +89,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772420042, "lastModified": 1773025010,
"narHash": "sha256-naZz40TUFMa0E0CutvwWsSPhgD5JldyTUDEgP9ADpfU=", "narHash": "sha256-khlHllTsovXgT2GZ0WxT4+RvuMjNeR5OW0UYeEHPYQo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5af7af10f14706e4095bd6bc0d9373eb097283c6", "rev": "7b9f7f88ab3b339f8142dc246445abb3c370d3d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -197,11 +197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772633058, "lastModified": 1772985280,
"narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -300,11 +300,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1771969195, "lastModified": 1772972630,
"narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -316,11 +316,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1772598333, "lastModified": 1773068389,
"narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -454,11 +454,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772416961, "lastModified": 1773021923,
"narHash": "sha256-/IiEGGjy0e8Ljo6418fFlqMJs7VLuLxU5pDR5uE+GLE=", "narHash": "sha256-ro+i3wNoD2p5FloGGlkCzdmzgBDeq2LJwaIpaI9Dk7Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "bcdbafece2815d32c8dfc51ef17f2858f3d4cfbc", "rev": "7f92c2bcbeb42ce87770a7565f0e6f92c8134354",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -530,11 +530,11 @@
"trackerlist": { "trackerlist": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772579383, "lastModified": 1773184165,
"narHash": "sha256-uWJcem+KJZ1xBWv3WYwpYoW/xrie67h47DVUhQl3GcI=", "narHash": "sha256-uGD+QgYZD1ntXl43523bKziyBUs1c3ONi+n5FeFZre0=",
"owner": "ngosang", "owner": "ngosang",
"repo": "trackerslist", "repo": "trackerslist",
"rev": "6eed267b7044a39b1ccc66437cb56ec38373f288", "rev": "448eba328ad00172a4ba049ec9f9f073b9cd278b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -579,17 +579,17 @@
"website": { "website": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1768266466, "lastModified": 1773169503,
"narHash": "sha256-d4dZzEcIKuq4DhNtXczaflpRifAtcOgNr45W2Bexnps=", "narHash": "sha256-P+T2H18k3zmEHxu7ZIDYyTrK5G3KUcZYW1AzVMKyCMs=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "06011a27456b3b9f983ef1aa142b5773bcb52b6e", "rev": "ae7a7d8325f841c52efb6fd81c4956b84631aa06",
"revCount": 23, "revCount": 24,
"type": "git", "type": "git",
"url": "https://git.gardling.com/titaniumtown/website" "url": "https://git.sigkill.computer/titaniumtown/website"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.gardling.com/titaniumtown/website" "url": "https://git.sigkill.computer/titaniumtown/website"
} }
}, },
"ytbn-graphing-software": { "ytbn-graphing-software": {
@@ -605,11 +605,11 @@
"rev": "ac6265eae734363f95909df9a3739bf6360fa721", "rev": "ac6265eae734363f95909df9a3739bf6360fa721",
"revCount": 1130, "revCount": 1130,
"type": "git", "type": "git",
"url": "https://git.gardling.com/titaniumtown/YTBN-Graphing-Software" "url": "https://git.sigkill.computer/titaniumtown/YTBN-Graphing-Software"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.gardling.com/titaniumtown/YTBN-Graphing-Software" "url": "https://git.sigkill.computer/titaniumtown/YTBN-Graphing-Software"
} }
} }
}, },

View File

@@ -56,7 +56,7 @@
}; };
website = { website = {
url = "git+https://git.gardling.com/titaniumtown/website"; url = "git+https://git.sigkill.computer/titaniumtown/website";
flake = false; flake = false;
}; };
@@ -66,7 +66,7 @@
}; };
ytbn-graphing-software = { ytbn-graphing-software = {
url = "git+https://git.gardling.com/titaniumtown/YTBN-Graphing-Software"; url = "git+https://git.sigkill.computer/titaniumtown/YTBN-Graphing-Software";
}; };
arr-init = { arr-init = {

View File

@@ -45,7 +45,8 @@ rec {
https = { https = {
certs = services_dir + "/http_certs"; certs = services_dir + "/http_certs";
domain = "gardling.com"; domain = "sigkill.computer";
old_domain = "gardling.com"; # Redirect traffic from old domain
}; };
gitea = { gitea = {

View File

@@ -41,6 +41,9 @@ let
hugo --minify -d $out; hugo --minify -d $out;
''; '';
}; };
newDomain = service_configs.https.domain;
oldDomain = service_configs.https.old_domain;
in in
{ {
imports = [ imports = [
@@ -52,14 +55,53 @@ in
services.caddy = { services.caddy = {
enable = true; enable = true;
email = "titaniumtown@proton.me"; email = "titaniumtown@proton.me";
# Enable on-demand TLS for old domain redirects
# Certs are issued dynamically when subdomains are accessed
globalConfig = ''
on_demand_tls {
ask http://localhost:9123/check
}
'';
# Internal endpoint to validate on-demand TLS requests
# Only allows certs for *.${oldDomain}
extraConfig = ''
http://localhost:9123 {
@allowed expression {query.domain}.endsWith(".${oldDomain}") || {query.domain} == "${oldDomain}" || {query.domain} == "www.${oldDomain}"
respond @allowed 200
respond 403
}
'';
virtualHosts = { virtualHosts = {
${service_configs.https.domain} = { ${newDomain} = {
extraConfig = '' extraConfig = ''
root * ${hugoWebsite} root * ${hugoWebsite}
file_server browse file_server browse
''; '';
serverAliases = [ "www.${service_configs.https.domain}" ]; serverAliases = [ "www.${newDomain}" ];
};
# Redirect old domain (bare + www) to new domain
${oldDomain} = {
extraConfig = ''
redir https://${newDomain}{uri} permanent
'';
serverAliases = [ "www.${oldDomain}" ];
};
# Wildcard redirect for all old domain subdomains
# Uses on-demand TLS - certs issued automatically on first request
"*.${oldDomain}" = {
extraConfig = ''
tls {
on_demand
}
# {labels.2} extracts subdomain from *.gardling.com
redir https://{labels.2}.${newDomain}{uri} permanent
'';
}; };
}; };
}; };

View File

@@ -1,34 +1,9 @@
{ {
config, config,
pkgs,
service_configs, service_configs,
lib, lib,
... ...
}: }:
let
package =
let
src = pkgs.fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "continuwuity";
rev = "052c4dfa2165fdc4839fed95b71446120273cf23";
hash = "sha256-kQV4glRrKczoJpn9QIMgB5ac+saZQjSZPel+9K9Ykcs=";
};
in
pkgs.matrix-continuwuity.overrideAttrs (old: {
inherit src;
cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
inherit src;
name = "${old.pname}-vendor";
hash = "sha256-vlOXQL8wwEGFX+w0G/eIeHW3J1UDzhJ501kYhAghDV8=";
};
patches = (old.patches or [ ]) ++ [
];
});
in
{ {
imports = [ imports = [
(lib.serviceMountWithZpool "continuwuity" service_configs.zpool_ssds [ (lib.serviceMountWithZpool "continuwuity" service_configs.zpool_ssds [
@@ -41,7 +16,6 @@ in
services.matrix-continuwuity = { services.matrix-continuwuity = {
enable = true; enable = true;
inherit package;
settings.global = { settings.global = {
port = [ service_configs.ports.matrix ]; port = [ service_configs.ports.matrix ];

View File

@@ -102,7 +102,6 @@
ChokingAlgorithm = "RateBased"; ChokingAlgorithm = "RateBased";
PieceExtentAffinity = true; PieceExtentAffinity = true;
SuggestMode = true; SuggestMode = true;
CoalesceReadWrite = true;
# max_queued_disk_bytes: the max bytes waiting in the disk I/O queue. # max_queued_disk_bytes: the max bytes waiting in the disk I/O queue.
# When this limit is reached, peer connections stop reading from their # When this limit is reached, peer connections stop reading from their
@@ -112,6 +111,12 @@
# where ZFS txg commits cause periodic I/O stalls. # where ZFS txg commits cause periodic I/O stalls.
DiskQueueSize = 67108864; # 64MB DiskQueueSize = 67108864; # 64MB
# POSIX-compliant disk I/O: uses pread/pwrite instead of mmap.
# On ZFS, mmap forces data into BOTH ARC and Linux page cache (double-caching),
# wasting RAM. pread/pwrite goes only through ARC, maximizing its effectiveness.
# Saved 26 gb of memory!!
DiskIOType = "Posix";
# === Network buffer tuning (from libtorrent high_performance_seed preset) === # === Network buffer tuning (from libtorrent high_performance_seed preset) ===
# "always stuff at least 1 MiB down each peer pipe, to quickly ramp up send rates" # "always stuff at least 1 MiB down each peer pipe, to quickly ramp up send rates"
SendBufferLowWatermark = 1024; # 1MB (KiB) -- matches high_performance_seed SendBufferLowWatermark = 1024; # 1MB (KiB) -- matches high_performance_seed