public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13324 from zimbatm/doc-from-wiki

Browse Source 
Converting the wiki to documentation
This commit is contained in:
zimbatm 2016-02-25 19:37:43 +00:00
commit 76f5cf3f31
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/hardware/sane.nix
View File

@ -21,7 +21,13 @@ in
hardware.sane.enable = mkOption { hardware.sane.enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = "Enable support for SANE scanners."; description = ''
Enable support for SANE scanners.
<note><para>
Users in the "scanner" group will gain access to the scanner.
</para></note>
'';
}; };
hardware.sane.snapshot = mkOption { hardware.sane.snapshot = mkOption {
@ -33,7 +39,14 @@ in
hardware.sane.extraBackends = mkOption { hardware.sane.extraBackends = mkOption {
type = types.listOf types.path; type = types.listOf types.path;
default = []; default = [];
description = "Packages providing extra SANE backends to enable."; description = ''
Packages providing extra SANE backends to enable.
<note><para>
The example contains the package for HP scanners.
</para></note>
'';
example = literalExample "[ pkgs.hplipWithPlugin ]";
}; };
hardware.sane.configDir = mkOption { hardware.sane.configDir = mkOption {

20
nixos/modules/services/network-filesystems/samba.nix
View File

@ -79,6 +79,14 @@ in
description = '' description = ''
Whether to enable Samba, which provides file and print Whether to enable Samba, which provides file and print
services to Windows clients through the SMB/CIFS protocol. services to Windows clients through the SMB/CIFS protocol.
<note>
<para>If you use the firewall consider adding the following:</para>
<programlisting>
networking.firewall.allowedTCPPorts = [ 139 445 ];
networking.firewall.allowedUDPPorts = [ 137 138 ];
</programlisting>
</note>
''; '';
}; };
@ -86,7 +94,7 @@ in
type = types.package; type = types.package;
default = pkgs.samba; default = pkgs.samba;
defaultText = "pkgs.samba"; defaultText = "pkgs.samba";
example = literalExample "pkgs.samba4"; example = literalExample "pkgs.samba3";
description = '' description = ''
Defines which package should be used for the samba server. Defines which package should be used for the samba server.
''; '';
@ -118,6 +126,10 @@ in
description = '' description = ''
Additional global section and extra section lines go in here. Additional global section and extra section lines go in here.
''; '';
example = ''
guest account = nobody
map to guest = bad user
'';
}; };
configText = mkOption { configText = mkOption {
@ -154,9 +166,11 @@ in
''; '';
type = types.attrsOf (types.attrsOf types.unspecified); type = types.attrsOf (types.attrsOf types.unspecified);
example = example =
{ srv = { public =
{ path = "/srv"; { path = "/srv/public";
"read only" = true; "read only" = true;
browseable = "yes";
"guest ok" = "yes";
comment = "Public samba share."; comment = "Public samba share.";
}; };
}; };