From d15e863f2464445d5e0e1016531a59d1db9eba57 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Sun, 6 Jun 2021 19:34:30 +0200
Subject: [PATCH] pennyworth: update

---
 nix/sources.json              | 7 ++++---
 nixos/modules/muflax-blog.nix | 4 ++--
 nixos/services/git.nix        | 1 +
 nixos/services/pub.nix        | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index 906f488..5fa3176 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -48,11 +48,12 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-mailserver": {
-        "sha256": "1m8ylrxlkn8nrpsvnivg32ncba9jkfal8a9sjy840hpl1jlm5lc4",
+        "rev": "5675b122a947b40e551438df6a623efad19fd2e7",
+        "sha256": "1fwhb7a5v9c98nzhf3dyqf3a5ianqh7k50zizj8v5nmj3blxw4pi",
         "type": "tarball",
-        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/ee3d38a1570a1a9aa5e2daa3284d65a35d5e8864/nixos-mailserver-ee3d38a1570a1a9aa5e2daa3284d65a35d5e8864.tar.gz",
+        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/5675b122a947b40e551438df6a623efad19fd2e7/nixos-mailserver-5675b122a947b40e551438df6a623efad19fd2e7.tar.gz",
         "url_template": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/<version>/nixos-mailserver-<version>.tar.gz",
-        "version": "ee3d38a1570a1a9aa5e2daa3284d65a35d5e8864"
+        "version": "5675b122a947b40e551438df6a623efad19fd2e7"
     },
     "nixpkgs": {
         "branch": "master",
diff --git a/nixos/modules/muflax-blog.nix b/nixos/modules/muflax-blog.nix
index a45653f..eeed725 100644
--- a/nixos/modules/muflax-blog.nix
+++ b/nixos/modules/muflax-blog.nix
@@ -52,9 +52,9 @@ in with lib; {
       '') [ "daily" "gospel" "blog" ]);
     };
     services.tor.enable = true;
-    services.tor.hiddenServices.muflax-blog.map = [{
+    services.tor.relay.onionServices.muflax-blog.map = [{
       port = 80;
-      toPort = cfg.web-server.port;
+      target.port = cfg.web-server.port;
     }];
     services.tor.service-keys.muflax-blog = cfg.hidden-service.private_key;
   };
diff --git a/nixos/services/git.nix b/nixos/services/git.nix
index 9b60fc1..67c6e00 100644
--- a/nixos/services/git.nix
+++ b/nixos/services/git.nix
@@ -14,6 +14,7 @@ in {
       home = config.services.gitea.stateDir;
       extraGroups = [ "git" ];
       useDefaultShell = true;
+      isSystemUser = true;
     };
     services.gitea = {
       enable = true;
diff --git a/nixos/services/pub.nix b/nixos/services/pub.nix
index 1aee4d0..5ac14c7 100644
--- a/nixos/services/pub.nix
+++ b/nixos/services/pub.nix
@@ -14,6 +14,7 @@ in {
     users.extraUsers.public = {
       home = "/home/public";
       useDefaultShell = true;
+      isSystemUser = true;
       openssh.authorizedKeys.keys = with (import ../sshkeys.nix); [ public ];
       createHome = true;
     };