gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(access): network interface config

Browse source
This commit is contained in:
arcnmx 2024-03-23 21:13:01 -07:00
parent ee3834d72a
commit f2fddc1001
42 changed files with 466 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/kyuuto/opl.nix
View file

@ -42,10 +42,6 @@ in {
};
shares.opl = let
inherit (config.networking.access) cidrForNetwork;
localAddrs =
cidrForNetwork.loopback.all
++ cidrForNetwork.local.all
++ lib.optionals config.services.tailscale.enable cidrForNetwork.tail.all;
in
mkIf cfg.enable {
comment = "Kyuuto Media OPL";
@ -58,7 +54,7 @@ in {
"@kyuuto-peeps"
];
"strict sync" = false;
"hosts allow" = localAddrs;
"hosts allow" = cidrForNetwork.allLocal.all;
};
};
services.tmpfiles = let

9
nixos/kyuuto/samba.nix
View file

@ -4,14 +4,9 @@
...
}: let
inherit (lib.modules) mkIf mkMerge mkDefault;
inherit (lib.lists) optionals;
inherit (config.networking.access) cidrForNetwork;
inherit (config) kyuuto;
cfg = config.services.samba;
localAddrs =
cidrForNetwork.loopback.all
++ cidrForNetwork.local.all
++ optionals config.services.tailscale.enable cidrForNetwork.tail.all;
guestUsers = mkIf cfg.guest.enable [cfg.guest.user];
kyuuto-media = {
"create mask" = "0664";
@ -41,7 +36,7 @@ in {
["@peeps"]
];
#"guest only" = true;
"hosts allow" = localAddrs;
"hosts allow" = cidrForNetwork.allLocal.all;
"acl group control" = true;
"create mask" = "0664";
"force directory mode" = "3000";
@ -61,7 +56,7 @@ in {
];
"read list" = guestUsers;
"write list" = ["@kyuuto-peeps"];
"hosts allow" = localAddrs;
"hosts allow" = cidrForNetwork.allLocal.all;
}
];
kyuuto-library-net = mkMerge [