diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-16 16:56:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 16:56:24 +0200 |
| commit | ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc (patch) | |
| tree | ee4c3ba334b28bda52a605a3e13ede4485025895 /nixos/modules/services/network-filesystems | |
| parent | d3c5a9bf17d112d8ab05803b0d8e8781599d6d31 (diff) | |
| parent | 51169880bd41b24642c5440c4d51c459aa2a8b05 (diff) | |
| download | nixlib-ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc.tar nixlib-ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc.tar.gz nixlib-ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc.tar.bz2 nixlib-ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc.tar.lz nixlib-ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc.tar.xz nixlib-ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc.tar.zst nixlib-ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc.zip | |
Merge pull request #44238 from jfrankenau/samba-conf-override
nixos/samba: allow dummy conf file to be overridden
Diffstat (limited to 'nixos/modules/services/network-filesystems')
| -rw-r--r-- | nixos/modules/services/network-filesystems/samba.nix | 10 |
1 files 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 { |