about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-02-27 02:45:40 +0000
committerAlyssa Ross <hi@alyssa.is>2021-02-27 02:45:40 +0000
commit7eb57d645ab60d8e61911c1aebc221cc2b9d98f8 (patch)
tree1ae2823cfdd50f2995020d6a682d3ee96d564c4e
parentc6f9ce66ae0cd4225319b819734337e6d1cf6f11 (diff)
downloadnixlib-7eb57d645ab60d8e61911c1aebc221cc2b9d98f8.tar
nixlib-7eb57d645ab60d8e61911c1aebc221cc2b9d98f8.tar.gz
nixlib-7eb57d645ab60d8e61911c1aebc221cc2b9d98f8.tar.bz2
nixlib-7eb57d645ab60d8e61911c1aebc221cc2b9d98f8.tar.lz
nixlib-7eb57d645ab60d8e61911c1aebc221cc2b9d98f8.tar.xz
nixlib-7eb57d645ab60d8e61911c1aebc221cc2b9d98f8.tar.zst
nixlib-7eb57d645ab60d8e61911c1aebc221cc2b9d98f8.zip
modules/tor,sys/atuin: fix tor deprecation warnings
-rw-r--r--modules/server/tor/default.nix8
-rw-r--r--sys/atuin.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/server/tor/default.nix b/modules/server/tor/default.nix
index f0447a3d1c4a..3e93309835b6 100644
--- a/modules/server/tor/default.nix
+++ b/modules/server/tor/default.nix
@@ -5,15 +5,15 @@
 
   services.tor.enable = true;
 
-  services.tor.relay.accountingMax =
+  services.tor.settings.AccountingMax =
     lib.mkDefault (throw "Set tor accountingMax!!");
 
-  services.tor.relay.accountingStart =
+  services.tor.settings.AccountingStart =
     lib.mkDefault (throw "Set tor accountingStart!!");
 
   services.tor.relay.enable = true;
-  services.tor.relay.contactInfo = "hi@alyssa.is";
-  services.tor.relay.nickname = lib.mkDefault config.networking.hostName;
   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 85a3437e1457..187db3947167 100644
--- a/sys/atuin.nix
+++ b/sys/atuin.nix
@@ -291,8 +291,8 @@ in
 
   environment.systemPackages = with pkgs; [ cgit git ];
 
-  services.tor.relay.accountingMax = "50 GBytes";
-  services.tor.relay.accountingStart = "day 12:00";
+  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; }
   ];