From c8aee4b4363b6bf905a521b05b7476960e8286c8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 10 Apr 2024 13:04:08 +0200 Subject: sys/atuin: disable tor I don't have the spare CPU for this any more. :( --- modules/server/tor/default.nix | 19 ------------------- sys/atuin.nix | 10 ++++------ 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 modules/server/tor/default.nix 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"; } -- cgit 1.4.1