configuration-templates – Diff between revs 162 and 165

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 162 Rev 165
Line 37... Line 37...
37 domain master = no 37 domain master = no
38 preferred master = no 38 preferred master = no
39 security = user 39 security = user
40 # For compatibility with scripts. 40 # For compatibility with scripts.
41 passdb backend = smbpasswd 41 passdb backend = smbpasswd
42 map to guest = Bad Password 42 map to guest = Bad User
43 guest account = nobody 43 guest account = nobody
44 # For compatibility with clients. 44 # Allow some variable expansions to work.
-   45 #%M
45 #client use spnego = no 46 hostname lookups = yes
46 #client ntlmv2 auth = no 47 #%m
47 acl allow execute always = True 48 #smb ports = 139
48 # Extended attributes on files. 49 # Extended attributes on files.
49 ea support = yes 50 ea support = yes
50 map acl inherit = yes 51 map acl inherit = yes
51 store dos attributes = yes 52 store dos attributes = yes
Line -... Line 53...
-   53  
-   54 # Samba version support (support legacy clients).
-   55 min protocol = NT1
52   56  
-   57 # Samba modules.
53 # Samba modules. 58 # vfs objects = shadow_copy2 catia fruit streams_xattr acl_xattr recycle crossrename io_uring aio_pthread
54 vfs objects = shadow_copy2 catia fruit streams_xattr acl_xattr recycle aio_pthread 59 vfs objects = shadow_copy2 catia fruit streams_xattr acl_xattr recycle crossrename aio_pthread
55 shadow: snapdir = .zfs/snapshot 60 shadow: snapdir = .zfs/snapshot
56 shadow: sort = desc 61 shadow: sort = desc
57 shadow: format = zfs-auto-snap_%S-%Y-%m-%d-%H%M 62 shadow: format = zfs-auto-snap_%S-%Y-%m-%d-%H%M
58 shadow:localtime = no 63 shadow:localtime = no
Line 75... Line 80...
75 fruit:posix_rename = yes 80 fruit:posix_rename = yes
76 readdir_attr:aapl_finder_info = yes 81 readdir_attr:aapl_finder_info = yes
77 readdir_attr:aapl_max_access = yes 82 readdir_attr:aapl_max_access = yes
78 readdir_attr:aapl_rsize = yes 83 readdir_attr:aapl_rsize = yes
79 streams_xattr:store_stream_type = yes 84 streams_xattr:store_stream_type = yes
-   85 crossrename:sizelimit = 50
-   86 io_uring:num_entries = 128
-   87 io_uring:sqpoll = no
80 aio_linux:aio num events = 256 88 aio_linux:aio num events = 256
81 aio_pthread:aio open = true 89 aio_pthread:aio open = true
Line 82... Line -...
82   -  
83 # Turn off host mDFS for now. -  
84 host msdfs = no -  
85   90  
86 ### Tweaks 91 ### Tweaks
87 # Don't tweak Linux buffers: SO_RCVBUF=131072 SO_SNDBUF=131072 92 # Don't tweak Linux buffers: SO_RCVBUF=131072 SO_SNDBUF=131072
88 socket options=TCP_NODELAY IPTOS_LOWDELAY 93 socket options=TCP_NODELAY IPTOS_LOWDELAY
89 # No extent-based allocation: ZFS 94 # No extent-based allocation: ZFS
90 strict allocate = no -  
91 # Slowing down SMB4 -  
92 server signing = no 95 strict allocate = no
93 # No sendfile on: ZFS 96 # No sendfile on: ZFS
94 use sendfile = no -  
95 max open files = 65535 -  
96 min receivefile size = 16384 -  
97 # Use max packet size possible in negotiation. -  
98 max xmit = 65536 97 use sendfile = no
99 # Requires aio_linux as last module in vfs_objects 98 # Requires aio_pthread as last module in vfs_objects
100 aio read size = 1 99 aio read size = 1
101 aio write size = 1 100 aio write size = 1
102 # 1 MiB cache per file -  
103 #write cache size = 1048576 -  
104 getwd cache = true 101 # Enable raw rights and reads.
105 read raw = yes 102 read raw = yes
106 write raw = yes -  
107 # Consistency accross filesystems. -  
108 oplocks = on -  
109 kernel oplocks = yes -  
110 server multi channel support = yes -  
111 # Kill stale connections without open files. -  
112 deadtime = 15 -  
Line 113... Line 103...
113 max protocol = SMB2 103 write raw = yes
114   104  
115 # Logging 105 # Logging
Line 116... Line 106...
116 # 0 -> LOG_ERR, 1 -> LOG_WARNING, 2 -> LOG_NOTICE, 3 -> LOG_DEBUG 106 # 0 -> LOG_ERR, 1 -> LOG_WARNING, 2 -> LOG_NOTICE, 3 -> LOG_DEBUG
117 log level = 1 107 log level = 1
-   108  
-   109 # Include LDAP configuration.
-   110 #include = /etc/samba/smb.conf.ldap
Line 118... Line 111...
118   111  
119 # Include LDAP configuration. 112 # Include DFS.
Line 120... Line 113...
120 #include = /etc/samba/smb.conf.ldap 113 #include = /etc/samba/smb.conf.dfs
121 114
122 # Include local settings. -  
123 include = /etc/samba/smb.conf.local -  
124   -  
125 # Include shares. -