configuration-templates – Diff between revs 136 and 162

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 136 Rev 162
Line 31... Line 31...
31 [global] 31 [global]
32 bind interfaces only = yes 32 bind interfaces only = yes
33 name resolve order = lmhosts host wins bcast 33 name resolve order = lmhosts host wins bcast
Line 34... Line 34...
34   34  
-   35 # Standalone.
-   36 local master = no
35 # Standalone. 37 domain master = no
36 preferred master = yes 38 preferred master = no
37 security = user 39 security = user
38 # For compatibility with scripts. 40 # For compatibility with scripts.
39 passdb backend = smbpasswd 41 passdb backend = smbpasswd
40 map to guest = Bad Password 42 map to guest = Bad Password
41 guest account = nobody 43 guest account = nobody
42 # For compatibility with clients. 44 # For compatibility with clients.
43 client use spnego = no 45 #client use spnego = no
-   46 #client ntlmv2 auth = no
-   47 acl allow execute always = True
-   48 # Extended attributes on files.
-   49 ea support = yes
-   50 map acl inherit = yes
Line 44... Line 51...
44 client ntlmv2 auth = no 51 store dos attributes = yes
45   52  
-   53 # Samba modules.
46 # Samba modules. 54 vfs objects = shadow_copy2 catia fruit streams_xattr acl_xattr recycle aio_pthread
-   55 shadow: snapdir = .zfs/snapshot
47 vfs objects = catia fruit streams_xattr 56 shadow: sort = desc
-   57 shadow: format = zfs-auto-snap_%S-%Y-%m-%d-%H%M
48 # AIO / Linux 58 shadow:localtime = no
49 event:backend = aio 59 recycle:repository = .recycle/%U
50 posix:aio = yes 60 recycle:keeptree = yes
-   61 recycle:versions = yes
-   62 recycle:touch = yes
51 # Better compatibility with OSX. 63 recycle:directory_mode = 0777
-   64 recycle:subdir_mode = 0700
-   65 fruit:resource = file
52 ea support = yes 66 fruit:metadata = netatalk
-   67 fruit:locking = netatalk
53 fruit:aapl = yes 68 fruit:encoding = native
54 fruit:encoding = native 69 fruit:resource = xattr
-   70 fruit:time machine = no
55 fruit:locking = none 71 fruit:metadata = stream
-   72 fruit:locking = none
-   73 fruit:encoding = native
-   74 fruit:veto_appledouble = yes
-   75 fruit:posix_rename = yes
-   76 readdir_attr:aapl_finder_info = yes
-   77 readdir_attr:aapl_max_access = yes
56 fruit:metadata = stream 78 readdir_attr:aapl_rsize = yes
-   79 streams_xattr:store_stream_type = yes
-   80 aio_linux:aio num events = 256
-   81 aio_pthread:aio open = true
-   82  
Line 57... Line 83...
57 fruit:resource = file 83 # Turn off host mDFS for now.
58 aio_linux:aio num events = 256 84 host msdfs = no
59   85  
-   86 ### Tweaks
-   87 # Don't tweak Linux buffers: SO_RCVBUF=131072 SO_SNDBUF=131072
-   88 socket options=TCP_NODELAY IPTOS_LOWDELAY
-   89 # No extent-based allocation: ZFS
-   90 strict allocate = no
60 ### Tweaks 91 # Slowing down SMB4
61 # Don't tweak Linux buffers: SO_RCVBUF=131072 SO_SNDBUF=131072 92 server signing = no
62 socket options=TCP_NODELAY IPTOS_THROUGHPUT SO_KEEPALIVE SO_BROADCAST 93 # No sendfile on: ZFS
-   94 use sendfile = no
-   95 max open files = 65535
63 use sendfile = true 96 min receivefile size = 16384
64 max open files = 65535 97 # Use max packet size possible in negotiation.
65 min receivefile size = 131072 98 max xmit = 65536
-   99 # Requires aio_linux as last module in vfs_objects
66 # Requires aio_linux as last module in vfs_objects 100 aio read size = 1
-   101 aio write size = 1
67 aio read size = 16384 102 # 1 MiB cache per file
68 aio write size = 16384 103 #write cache size = 1048576
69 write cache size = 262144 104 getwd cache = true
-   105 read raw = yes
70 read raw = yes 106 write raw = yes
71 write raw = yes 107 # Consistency accross filesystems.
-   108 oplocks = on
-   109 kernel oplocks = yes
-   110 server multi channel support = yes
72 # Close connection on idle time (minutes). 111 # Kill stale connections without open files.
73 kernel oplocks = yes 112 deadtime = 15
74 server multi channel support = yes 113 max protocol = SMB2
75 114  
Line 76... Line 115...
76 # Logging 115 # Logging
Line 83... Line 122...
83 # Include local settings. 122 # Include local settings.
84 include = /etc/samba/smb.conf.local 123 include = /etc/samba/smb.conf.local
Line 85... Line 124...
85   124  
86 # Include shares. 125 # Include shares.
-   126 include = /etc/samba/smb.conf.share
-   127  
-   128 # Include DFS.
-   129 #include = /etc/samba/smb.conf.dfs