nydragon/nix-da
1
Fork 0
Code Issues Pull requests Activity Actions 1

fix(rsync): move brontes to modules and fix missed renames

Browse source
This commit is contained in:
Nydragon 2024-10-13 23:53:45 +02:00
parent 169ada30f6
commit b8c7300e8a
Signed by: nydragon
SSH key fingerprint: SHA256:iQnIC12spf4QjWSbarmkD2No1cLMlu6TWoV7K6cYF5g
4 changed files with 28 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -1,11 +1,13 @@
## Targets ## Targets
| Name | Arch | Description | | Name | Arch | Description |
| ------- | ------ | ----------- | | ------- | ------- | ---------------------------------------- |
| Marr | x86_64 | | | marr | x86_64 | Laptop Workstation |
| Brontes | x86_64 | | | brontes | x86_64 | Desktop Workstation |
| Styrax | x86_64 | | | 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 - https://github.com/notashelf/nyx

19
hosts/brontes/configuration.nix
View file

@ -47,16 +47,19 @@
}; };
rsync-backup = { rsync-backup = {
enable = true; enable = true;
sources = [ "/home/ny/notes" ]; modules = [
target = { {
location = "brontes-backup"; sources = [ "/home/ny/notes" ];
type = "rsyncd"; target = {
host = "nihilus"; location = "brontes-backup";
}; type = "rsyncd";
incremental.enable = true; host = "nihilus";
};
incremental.enable = true;
}
];
}; };
}; };
media.enableAll = true; media.enableAll = true;
}; };

18
hosts/raptus/headscale.nix
View file

@ -143,16 +143,14 @@ mkIf config.services.headscale.enable {
name = "headscale-acl.hujson"; name = "headscale-acl.hujson";
text = builtins.toJSON { text = builtins.toJSON {
acls = [ acls = [
(mkAcl [ "tag:client" ] [ "tag:client:*" ]) # client -> client (mkAcl [ "tag:client" ] [
(mkAcl [ "tag:client" ] [ "tag:server:*" ]) # client -> server "tag:client:*"
{ "tag:server:*"
action = "accept"; ]) # client -> {client, server}
src = [ (mkAcl [
"tag:client" "tag:client"
"tag:server" "tag:server"
]; ] [ "tag:backup:${toString options.modules.server.rsync-daemon.port.default}" ])
dst = [ "tag:backup:${toString options.modules.services.rsync-daemon.port.default}" ];
}
]; ];
ssh = [ ssh = [

26
options/services/rsync-backup/default.nix
View file

@ -83,21 +83,9 @@ in
default = "rsync-backup"; 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 under which Rsync runs.";
};
port = mkOption { port = mkOption {
type = port; 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 }) 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 = { };
};
}; };
} }