From c243dbf18064b3bdfff67e5af61f0f64f5eaa6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 19 Jul 2022 21:33:45 +0200
Subject: [PATCH] feat: update fully to 22.05

---
 systems/ful/configuration.nix     | 2 +-
 systems/makanek/configuration.nix | 2 +-
 systems/makanek/menstruation.nix  | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/systems/ful/configuration.nix b/systems/ful/configuration.nix
index f5ed139..a20fcd6 100644
--- a/systems/ful/configuration.nix
+++ b/systems/ful/configuration.nix
@@ -39,7 +39,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = kieran.email;
+    defaults.email = kieran.email;
   };
 
   users.users.root.passwordFile = toString <system-secrets/root.password>;
diff --git a/systems/makanek/configuration.nix b/systems/makanek/configuration.nix
index a8bc018..621480a 100644
--- a/systems/makanek/configuration.nix
+++ b/systems/makanek/configuration.nix
@@ -100,7 +100,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = kieran.email;
+    defaults.email = kieran.email;
   };
 
   environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
diff --git a/systems/makanek/menstruation.nix b/systems/makanek/menstruation.nix
index 3b322d8..6f10ef3 100644
--- a/systems/makanek/menstruation.nix
+++ b/systems/makanek/menstruation.nix
@@ -7,7 +7,10 @@
   telegram = pkgs.callPackage <menstruation-telegram> {};
   backendPort = 8000;
 in {
-  services.redis.enable = true;
+  services.redis.servers.menstruation = {
+    enable = true;
+    port = 6379;
+  };
 
   environment.systemPackages = [pkgs.redis];
 
@@ -23,7 +26,7 @@ in {
     wants = [
       "network-online.target"
       "menstruation-backend.service"
-      "redis.service"
+      "redis-menstruation.service"
     ];
     wantedBy = ["multi-user.target"];
     environment = {