about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-04-10 13:04:08 +0200
committerAlyssa Ross <hi@alyssa.is>2024-04-10 20:41:59 +0200
commitc8aee4b4363b6bf905a521b05b7476960e8286c8 (patch)
treed1404aa0ed0012aae053454b7dff5dc29e9cd8b2
parenta25e46a66224b6fdbeddd1027e651a5ef88d88d2 (diff)
downloadnixlib-c8aee4b4363b6bf905a521b05b7476960e8286c8.tar
nixlib-c8aee4b4363b6bf905a521b05b7476960e8286c8.tar.gz
nixlib-c8aee4b4363b6bf905a521b05b7476960e8286c8.tar.bz2
nixlib-c8aee4b4363b6bf905a521b05b7476960e8286c8.tar.lz
nixlib-c8aee4b4363b6bf905a521b05b7476960e8286c8.tar.xz
nixlib-c8aee4b4363b6bf905a521b05b7476960e8286c8.tar.zst
nixlib-c8aee4b4363b6bf905a521b05b7476960e8286c8.zip
sys/atuin: disable tor
I don't have the spare CPU for this any more. :(
-rw-r--r--modules/server/tor/default.nix19
-rw-r--r--sys/atuin.nix10
2 files changed, 4 insertions, 25 deletions
diff --git a/modules/server/tor/default.nix b/modules/server/tor/default.nix
deleted file mode 100644
index 3e93309835b6..000000000000
--- a/modules/server/tor/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib, config, ... }:
-
-{
-  networking.firewall.allowedTCPPorts = [ 143 ];
-
-  services.tor.enable = true;
-
-  services.tor.settings.AccountingMax =
-    lib.mkDefault (throw "Set tor accountingMax!!");
-
-  services.tor.settings.AccountingStart =
-    lib.mkDefault (throw "Set tor accountingStart!!");
-
-  services.tor.relay.enable = true;
-  services.tor.relay.role = "relay";
-  services.tor.settings.ContactInfo = "hi@alyssa.is";
-  services.tor.settings.Nickname = lib.mkDefault config.networking.hostName;
-  services.tor.settings.ORPort = [ 143 ];
-}
diff --git a/sys/atuin.nix b/sys/atuin.nix
index 18312a056375..acd54460d6e6 100644
--- a/sys/atuin.nix
+++ b/sys/atuin.nix
@@ -131,7 +131,6 @@ in
     ../modules/server/nginx
     ../modules/server/nixpk.gs
     ../modules/server/spectrum
-    ../modules/server/tor
     ../modules/server/xmpp
     ../modules/users
   ];
@@ -303,11 +302,10 @@ in
 
   services.postgresql.package = pkgs.postgresql_13;
 
-  services.tor.settings.AccountingMax = "50 GBytes";
-  services.tor.settings.AccountingStart = "day 12:00";
-  services.tor.settings.ORPort = [
-    { addr = "[2001:ba8:1f1:f0bc::2]"; port = 143; }
-  ];
+  systemd.services.cgit-qyliss.serviceConfig.MemoryHigh = "512M";
+  systemd.services.cgit-qyliss.serviceConfig.MemoryMax = "1G";
+  systemd.services.cgit-spectrum.serviceConfig.MemoryHigh = "512M";
+  systemd.services.cgit-spectrum.serviceConfig.MemoryMax = "1G";
 
   system.stateVersion = "18.03";
 }