From b8c7300e8aa113e67cf67e5dd296652bd06af9e0 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Sun, 13 Oct 2024 23:53:45 +0200
Subject: [PATCH] fix(rsync): move brontes to modules and fix missed renames

---
 README.md                                 | 14 ++++++------
 hosts/brontes/configuration.nix           | 19 ++++++++++-------
 hosts/raptus/headscale.nix                | 18 +++++++---------
 options/services/rsync-backup/default.nix | 26 +----------------------
 4 files changed, 28 insertions(+), 49 deletions(-)

diff --git a/README.md b/README.md
index 64186ea..dfbbeeb 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,13 @@
 ## Targets
 
-| Name    | Arch   | Description |
-| ------- | ------ | ----------- |
-| Marr    | x86_64 |             |
-| Brontes | x86_64 |             |
-| Styrax  | x86_64 |             |
+| Name    | Arch    | Description                              |
+| ------- | ------- | ---------------------------------------- |
+| marr    | x86_64  | Laptop Workstation                       |
+| brontes | x86_64  | Desktop Workstation                      |
+| styrax  | x86_64  |                                          |
+| raptus  | x86_64  |                                          |
+| nihilus | aarch64 | Small Pi used to make "off-site" backups |
 
-## Thanks to these awesome people for inspiration and documentation:
+## Thanks to these people for inspiration and documentation:
 
 - https://github.com/notashelf/nyx
diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index 00a9bbf..5ba3138 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -47,16 +47,19 @@
       };
       rsync-backup = {
         enable = true;
-        sources = [ "/home/ny/notes" ];
-        target = {
-          location = "brontes-backup";
-          type = "rsyncd";
-          host = "nihilus";
-        };
-        incremental.enable = true;
+        modules = [
+          {
+            sources = [ "/home/ny/notes" ];
+            target = {
+              location = "brontes-backup";
+              type = "rsyncd";
+              host = "nihilus";
+            };
+            incremental.enable = true;
+          }
+        ];
       };
     };
-
     media.enableAll = true;
   };
 
diff --git a/hosts/raptus/headscale.nix b/hosts/raptus/headscale.nix
index f8986d2..cb3e7fb 100644
--- a/hosts/raptus/headscale.nix
+++ b/hosts/raptus/headscale.nix
@@ -143,16 +143,14 @@ mkIf config.services.headscale.enable {
     name = "headscale-acl.hujson";
     text = builtins.toJSON {
       acls = [
-        (mkAcl [ "tag:client" ] [ "tag:client:*" ]) # client -> client
-        (mkAcl [ "tag:client" ] [ "tag:server:*" ]) # client -> server
-        {
-          action = "accept";
-          src = [
-            "tag:client"
-            "tag:server"
-          ];
-          dst = [ "tag:backup:${toString options.modules.services.rsync-daemon.port.default}" ];
-        }
+        (mkAcl [ "tag:client" ] [
+          "tag:client:*"
+          "tag:server:*"
+        ]) # client -> {client, server}
+        (mkAcl [
+          "tag:client"
+          "tag:server"
+        ] [ "tag:backup:${toString options.modules.server.rsync-daemon.port.default}" ])
       ];
 
       ssh = [
diff --git a/options/services/rsync-backup/default.nix b/options/services/rsync-backup/default.nix
index fba97a5..77c3786 100644
--- a/options/services/rsync-backup/default.nix
+++ b/options/services/rsync-backup/default.nix
@@ -83,21 +83,9 @@ in
       default = "rsync-backup";
     };
 
-    user = mkOption {
-      type = str;
-      default = "rsync-backup";
-      description = "User account under which Rsync runs.";
-    };
-
-    group = mkOption {
-      type = str;
-      default = "rsync-backup";
-      description = "Group under which Rsync runs.";
-    };
-
     port = mkOption {
       type = port;
-      default = options.modules.services.rsync-daemon.port.default;
+      default = options.modules.server.rsync-daemon.port.default;
     };
   };
 
@@ -160,17 +148,5 @@ in
         };
       }) cfg.modules
     );
-
-    users.users = mkIf (cfg.user == "rsync-backup") {
-      rsync-backup = {
-        useDefaultShell = true;
-        group = cfg.group;
-        isSystemUser = true;
-      };
-    };
-
-    users.groups = mkIf (cfg.group == "rsync-backup") {
-      rsync-backup = { };
-    };
   };
 }