diff --git a/modules/nixos/guests/midnight/default.nix b/modules/nixos/guests/midnight/default.nix index 45c2bc3..6cb5f73 100755 --- a/modules/nixos/guests/midnight/default.nix +++ b/modules/nixos/guests/midnight/default.nix @@ -41,7 +41,7 @@ in config = let macAddress = "02:00:00:00:00:${macOctet}"; - workers = deviceLogic 45 4 18 5 6; + workers = deviceLogic 35 4 18 5 6; in { environment.systemPackages = [ @@ -71,7 +71,7 @@ in mac = macAddress; } ]; - mem = deviceLogic 52100 5120 22000 6144 7168; + mem = deviceLogic 45000 5120 22000 6144 7168; shares = [ { mountPoint = "/nix/.ro-store"; diff --git a/modules/nixos/services/samba/sambaCeres/default.nix b/modules/nixos/services/samba/sambaCeres/default.nix index 868b793..1364334 100755 --- a/modules/nixos/services/samba/sambaCeres/default.nix +++ b/modules/nixos/services/samba/sambaCeres/default.nix @@ -4,6 +4,7 @@ }: let inherit (flake.config.services) instances; + inherit (flake.config.people) user0; service = instances.samba; in { @@ -22,24 +23,11 @@ in "guest ok" = "no"; "create mask" = "0664"; "directory mask" = "0775"; - "force user" = "microvm"; - "force group" = "wheel"; + "force user" = user0; + "force group" = "users"; "force create mode" = "0664"; "force directory mode" = "0775"; }; - "storage0" = { - path = "/mnt/storage"; - browseable = "yes"; - writeable = "yes"; - "guest ok" = "no"; - "create mask" = "0664"; - "directory mask" = "0775"; - "force user" = "microvm"; - "force group" = "wheel"; - "force create mode" = "0664"; - "force directory mode" = "0775"; - }; - }; }; }; diff --git a/modules/nixos/services/samba/sambaEris/default.nix b/modules/nixos/services/samba/sambaEris/default.nix index 6681084..079bee9 100755 --- a/modules/nixos/services/samba/sambaEris/default.nix +++ b/modules/nixos/services/samba/sambaEris/default.nix @@ -3,9 +3,8 @@ ... }: let - inherit (flake.config.services) - instances - ; + inherit (flake.config.services) instances; + inherit (flake.config.people) user0; service = instances.samba; in { @@ -19,12 +18,22 @@ in settings = { "raid0" = { path = "/mnt/raid0"; - writable = "true"; + writable = "yes"; + "valid users" = user0; + "force user" = user0; + "force group" = "users"; + "create mask" = "0644"; + "directory mask" = "0755"; }; }; }; }; + systemd.tmpfiles.rules = [ + "d /mnt/raid0 0755 ${user0} users -" + "Z /mnt/raid0 0755 ${user0} users -" + ]; + networking = { firewall = { allowedTCPPorts = [ diff --git a/systems/eris/config/filesystem.nix b/systems/eris/config/filesystem.nix index 98353a1..6710eb8 100755 --- a/systems/eris/config/filesystem.nix +++ b/systems/eris/config/filesystem.nix @@ -39,7 +39,7 @@ in fsType = "vfat"; }; "/mnt/raid0" = { - device = "/dev/md0"; + device = "/dev/md127"; fsType = "ext4"; options = [ "defaults" diff --git a/systems/mars/config/filesystem.nix b/systems/mars/config/filesystem.nix index e3c85b9..7b5bbdc 100755 --- a/systems/mars/config/filesystem.nix +++ b/systems/mars/config/filesystem.nix @@ -26,7 +26,6 @@ in ]; ceresFolders = [ "storage" - "storage0" ]; storageMounts = storageDrive: { name = "${mars.${storageDrive}.mount}";