From e097e3c577ea4a83e508b3aa2a37dc86b8295131 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 5 Jun 2021 15:52:06 +0200 Subject: ma treewide: make 21.05 compatible (is*User, other fixes) --- makefu/2configs/share/gum.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'makefu/2configs/share') diff --git a/makefu/2configs/share/gum.nix b/makefu/2configs/share/gum.nix index 27e0c638b..fd81f28ca 100644 --- a/makefu/2configs/share/gum.nix +++ b/makefu/2configs/share/gum.nix @@ -11,7 +11,10 @@ in { # home = "/var/empty"; # }; environment.systemPackages = [ pkgs.samba ]; - users.users.download.uid = genid "download"; + users.users.download = { + uid = genid "download"; + isNormalUser = true; + }; services.samba = { enable = true; shares = { -- cgit v1.2.3 From 9f2a1f8db104853fc74ae0f21c64e0fe42b3ad98 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 5 Jun 2021 19:23:13 +0200 Subject: ma smbguest: isNormalUser --- makefu/2configs/share/omo.nix | 1 + makefu/2configs/share/temp-share-samba.nix | 1 + makefu/2configs/share/wbob.nix | 1 + 3 files changed, 3 insertions(+) (limited to 'makefu/2configs/share') diff --git a/makefu/2configs/share/omo.nix b/makefu/2configs/share/omo.nix index 308142f03..32ac018e3 100644 --- a/makefu/2configs/share/omo.nix +++ b/makefu/2configs/share/omo.nix @@ -14,6 +14,7 @@ in { uid = config.ids.uids.smbguest; description = "smb guest user"; home = "/var/empty"; + isNormalUser = true; }; services.samba = { enable = true; diff --git a/makefu/2configs/share/temp-share-samba.nix b/makefu/2configs/share/temp-share-samba.nix index ac0eaa978..8d597f33a 100644 --- a/makefu/2configs/share/temp-share-samba.nix +++ b/makefu/2configs/share/temp-share-samba.nix @@ -12,6 +12,7 @@ uid = config.ids.uids.smbguest; description = "smb guest user"; home = "/home/share"; + isNormalUser = true; createHome = true; }; services.samba = { diff --git a/makefu/2configs/share/wbob.nix b/makefu/2configs/share/wbob.nix index 9695751ff..fd07d6ad5 100644 --- a/makefu/2configs/share/wbob.nix +++ b/makefu/2configs/share/wbob.nix @@ -7,6 +7,7 @@ description = "smb guest user"; home = "/home/share"; createHome = true; + isNormalUser = true; }; users.groups.mpd.members = [ "makefu" ]; services.samba = { -- cgit v1.2.3 From f7dfc2c43ad99f5971b12a6f6a8c88cca3634f77 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 5 Jun 2021 20:06:00 +0200 Subject: ma samba: remove isNormalUser again --- makefu/2configs/share/omo.nix | 1 - makefu/2configs/share/temp-share-samba.nix | 3 +-- makefu/2configs/share/wbob.nix | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'makefu/2configs/share') diff --git a/makefu/2configs/share/omo.nix b/makefu/2configs/share/omo.nix index 32ac018e3..308142f03 100644 --- a/makefu/2configs/share/omo.nix +++ b/makefu/2configs/share/omo.nix @@ -14,7 +14,6 @@ in { uid = config.ids.uids.smbguest; description = "smb guest user"; home = "/var/empty"; - isNormalUser = true; }; services.samba = { enable = true; diff --git a/makefu/2configs/share/temp-share-samba.nix b/makefu/2configs/share/temp-share-samba.nix index 8d597f33a..56beb5b42 100644 --- a/makefu/2configs/share/temp-share-samba.nix +++ b/makefu/2configs/share/temp-share-samba.nix @@ -9,10 +9,9 @@ networking.firewall.allowedTCPPorts = [ 139 445 ]; users.users.smbguest = { name = "smbguest"; - uid = config.ids.uids.smbguest; + uid = config.ids.uids.smbguest; # effectively systemUser description = "smb guest user"; home = "/home/share"; - isNormalUser = true; createHome = true; }; services.samba = { diff --git a/makefu/2configs/share/wbob.nix b/makefu/2configs/share/wbob.nix index fd07d6ad5..f2c36b551 100644 --- a/makefu/2configs/share/wbob.nix +++ b/makefu/2configs/share/wbob.nix @@ -3,11 +3,10 @@ networking.firewall.allowedTCPPorts = [ 139 445 ]; users.users.smbguest = { name = "smbguest"; - uid = config.ids.uids.smbguest; + uid = config.ids.uids.smbguest; # effectively systemUser description = "smb guest user"; home = "/home/share"; createHome = true; - isNormalUser = true; }; users.groups.mpd.members = [ "makefu" ]; services.samba = { -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/59000000.lock: No such file or directory (2)