diff options
Diffstat (limited to 'ops')
| -rw-r--r-- | ops/glesys/dns-nixery-dev.tf | 2 | ||||
| -rw-r--r-- | ops/glesys/dns-tvl-fyi.tf | 2 | ||||
| -rw-r--r-- | ops/machines/all-systems.nix | 1 | ||||
| -rw-r--r-- | ops/machines/nixery-01/default.nix | 9 | ||||
| -rw-r--r-- | ops/modules/automatic-gc.nix | 5 | ||||
| -rw-r--r-- | ops/modules/josh.nix | 2 | ||||
| -rw-r--r-- | ops/modules/www/tazj.in.nix | 5 | ||||
| -rw-r--r-- | ops/users/default.nix | 10 |
8 files changed, 33 insertions, 3 deletions
diff --git a/ops/glesys/dns-nixery-dev.tf b/ops/glesys/dns-nixery-dev.tf index 0ea5d313d0..42bcec7e21 100644 --- a/ops/glesys/dns-nixery-dev.tf +++ b/ops/glesys/dns-nixery-dev.tf @@ -12,7 +12,7 @@ resource "glesys_dnsdomain_record" "nixery_dev_apex_A" { domain = glesys_dnsdomain.nixery_dev.id host = "@" type = "A" - data = "51.250.48.185" # nixery-01.tvl.fyi + data = "51.250.51.78" # nixery-01.tvl.fyi } resource "glesys_dnsdomain_record" "nixery_dev_NS1" { diff --git a/ops/glesys/dns-tvl-fyi.tf b/ops/glesys/dns-tvl-fyi.tf index e448bc4486..9d7972c412 100644 --- a/ops/glesys/dns-tvl-fyi.tf +++ b/ops/glesys/dns-tvl-fyi.tf @@ -57,7 +57,7 @@ resource "glesys_dnsdomain_record" "tvl_fyi_nixery-01_A" { domain = glesys_dnsdomain.tvl_fyi.id host = "nixery-01" type = "A" - data = "51.250.48.185" + data = "51.250.51.78" } # Explicit records for all services running on whitby diff --git a/ops/machines/all-systems.nix b/ops/machines/all-systems.nix index 449d41a5f7..c4382fbddb 100644 --- a/ops/machines/all-systems.nix +++ b/ops/machines/all-systems.nix @@ -16,6 +16,7 @@ yeren mugwump ogopogo + lusca ]) ++ (with depot.users.wpcarro.nixos; [ diff --git a/ops/machines/nixery-01/default.nix b/ops/machines/nixery-01/default.nix index c7c8fd4b5e..c99db214d8 100644 --- a/ops/machines/nixery-01/default.nix +++ b/ops/machines/nixery-01/default.nix @@ -28,4 +28,13 @@ in }; services.depot.nixery.enable = true; + + # Automatically collect garbage from the Nix store. + services.depot.automatic-gc = { + enable = true; + interval = "1 hour"; + diskThreshold = 25; # GiB + maxFreed = 150; # GiB + preserveGenerations = "30d"; + }; } diff --git a/ops/modules/automatic-gc.nix b/ops/modules/automatic-gc.nix index ad53a63f7f..003f160919 100644 --- a/ops/modules/automatic-gc.nix +++ b/ops/modules/automatic-gc.nix @@ -13,6 +13,11 @@ let gcScript = pkgs.writeShellScript "automatic-nix-gc" '' set -ueo pipefail + if [ -e /run/stop-automatic-gc ]; then + echo "GC is disabled through /run/stop-automatic-gc" + exit 0 + fi + readonly MIN_THRESHOLD_KIB="${toString (GiBtoKiB cfg.diskThreshold)}" readonly MAX_FREED_BYTES="${toString (GiBtoBytes cfg.maxFreed)}" readonly GEN_THRESHOLD="${cfg.preserveGenerations}" diff --git a/ops/modules/josh.nix b/ops/modules/josh.nix index 4591ebf0f0..3c37d0fec3 100644 --- a/ops/modules/josh.nix +++ b/ops/modules/josh.nix @@ -26,7 +26,7 @@ in DynamicUser = true; StateDirectory = "josh"; Restart = "always"; - ExecStart = "${depot.third_party.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.port} --remote https://cl.tvl.fyi/ --require-auth"; + ExecStart = "${pkgs.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.port} --remote https://cl.tvl.fyi/ --require-auth"; }; }; }; diff --git a/ops/modules/www/tazj.in.nix b/ops/modules/www/tazj.in.nix index 3b80222e0d..47eefca2a6 100644 --- a/ops/modules/www/tazj.in.nix +++ b/ops/modules/www/tazj.in.nix @@ -33,6 +33,11 @@ return 302 https://predlozhnik.ru; } + # redirect for easier entry on a TV + location = /tv { + return 302 https://tazj.in/blobs/play.html; + } + # Temporary place for serving static files. location /blobs/ { alias /var/lib/tazjins-blobs/; diff --git a/ops/users/default.nix b/ops/users/default.nix index 34e0ab85c3..a2182a5460 100644 --- a/ops/users/default.nix +++ b/ops/users/default.nix @@ -224,4 +224,14 @@ email = "espes@pequalsnp.com"; password = "{ARGON2}$argon2id$v=19$m=19456,t=2,p=1$eXeFrbNxuKn/JCpQr5VmxA$NtMNBceNg/JtqMfHk/qHxEHsEVsTWmHJbpq4ve/+XYg"; } + { + username = "caralice"; + email = "tvl@alice-carroll.pet"; + password = "{ARGON2}$argon2id$v=19$m=19456,t=2,p=1$mt/0RzKw4RHxm7ybpMHP5Q$P/SDBMv5si9D98NFO/eZgh2+InlByqYxqAvQWhl+p0c"; + } + { + username = "yuka"; + email = "tvl@yuka.dev"; + password = "{ARGON2}$argon2id$v=19$m=65536,t=2,p=1$aEyiAIuynQMwfY7xE+pMxg$QdghylHO2JZMR/YyYf4UAnhhb/gBdAkoDeANEwdixxU"; + } ] |