From 51169880bd41b24642c5440c4d51c459aa2a8b05 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau <johannes@frankenau.net> Date: Mon, 30 Jul 2018 20:13:32 +0200 Subject: [PATCH] nixos/samba: allow dummy conf file to be overridden This allows configuring samba clients on systems without a samba server. --- nixos/modules/services/network-filesystems/samba.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index b23266e8d43a..10dc58311212 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -214,12 +214,10 @@ in } ]; # Always provide a smb.conf to shut up programs like smbclient and smbspool. - environment.etc = singleton - { source = - if cfg.enable then configFile - else pkgs.writeText "smb-dummy.conf" "# Samba is disabled."; - target = "samba/smb.conf"; - }; + environment.etc."samba/smb.conf".source = mkOptionDefault ( + if cfg.enable then configFile + else pkgs.writeText "smb-dummy.conf" "# Samba is disabled." + ); } (mkIf cfg.enable {