[packages/samba/DEVEL: 105/111] - updated config with upstream defaults

baggins baggins at pld-linux.org
Wed Jan 15 19:47:15 CET 2014


commit 99fdb0b63aac22b1075be8dc01a5434f33e66d4a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jan 12 18:36:10 2014 +0100

    - updated config with upstream defaults

 samba4.spec |  4 ++--
 smb.conf    | 76 +++++++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 61 insertions(+), 19 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 0062f9d..1ef9298 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -716,13 +716,13 @@ fi
 %files
 %defattr(644,root,root,755)
 %{?with_ldap:%doc examples/LDAP}
+%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smbusers
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/samba
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/samba
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.samba
-%config(noreplace) %verify(not md5 mtime size) /etc/env.d/LDB_MODULES_PATH
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/samba
-#%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/env.d/LDB_MODULES_PATH
 %attr(754,root,root) /etc/rc.d/init.d/samba
 %attr(754,root,root) /etc/rc.d/init.d/smb
 %{systemdunitdir}/nmb.service
diff --git a/smb.conf b/smb.conf
index 7edd7f9..90efec9 100644
--- a/smb.conf
+++ b/smb.conf
@@ -3,23 +3,42 @@
 # here. Samba has a huge number of configurable options (perhaps too
 # many!) most of which are not shown in this example
 #
-# Any line which starts with a ; (semi-colon) or a # (hash) 
+# For a step to step guide on installing, configuring and using samba,
+# read the Samba-HOWTO-Collection. This may be obtained from:
+#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
+#
+# Many working examples of smb.conf files can be found in the
+# Samba-Guide which is generated daily and can be downloaded from:
+#  http://www.samba.org/samba/docs/Samba-Guide.pdf
+#
+# Any line which starts with a ; (semi-colon) or a # (hash)
 # is a comment and is ignored. In this example we will use a #
 # for commentry and a ; for parts of the config file that you
 # may wish to enable
 #
 # NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not many any basic syntactic errors. 
+# to check that you have not made any basic syntactic errors.
 #
 #======================= Global Settings =====================================
 [global]
 
-# workgroup = NT-Domain-Name or Workgroup-Name
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
    workgroup = MYGROUP
 
 # server string is the equivalent of the NT Description field
    server string = Samba Server
 
+# Server role. Defines in which mode Samba will operate. Possible
+# values are "standalone server", "member server", "classic primary
+# domain controller", "classic backup domain controller", "active
+# directory domain controller".
+#
+# Most people will want "standalone sever" or "member server".
+# Running as "active directory domain controller" will require first
+# running "samba-tool domain provision" to wipe databases and create a
+# new domain.
+   server role = standalone server
+
 # This option is important for security. It allows you to restrict
 # connections to machines which are on your local network. The
 # following example restricts access to two C class networks and
@@ -35,7 +54,7 @@
 # It should not be necessary to spell out the print system type unless
 # yours is non-standard. Currently supported print systems include:
 # bsd, sysv, plp, lprng, aix, hpux, qnx, cups
-   printing = lprng
+   printing = cups
 
 # Uncomment this if you want a guest account, you must add this to /etc/passwd
 # otherwise the user "nobody" is used
@@ -48,9 +67,13 @@
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
 
+# Specifies the Kerberos or Active Directory realm the host is part of
+;   realm = MY_REALM
+
 # Security mode. Most people will want user level security. See
 # /usr/share/doc/samba-doc-html-*/Samba3-HOWTO/ServerType.html for details.
    security = user
+
 # Use password server option only with security = server
 ;   password server = <NT-Server-Name>
 
@@ -74,27 +97,35 @@
 ;  passwd program = /usr/bin/passwd %u
 ;  passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passwd:*all*authentication*tokens*updated*successfully*
 
+# Backend to store user information in. New installations should
+# use either tdbsam or ldapsam. smbpasswd is available for backwards
+# compatibility. tdbsam requires no further configuration.
+;   passdb backend = tdbsam
+
 # Unix users can map to different SMB User names
 ;  username map = /etc/samba/smbusers
 
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
+# of the machine that is connecting.
+# Note: Consider carefully the location in the configuration file of
+#       this line.  The included file is read at that point.
 ;   include = /etc/samba/smb.conf.%m
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
-   socket options = TCP_NODELAY 
+   socket options = TCP_NODELAY
 
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them
 # here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
+;   interfaces = 192.168.12.2/24 192.168.13.2/24
 
 # Configure remote browse list synchronisation here
 #  request announcement to, or browse list sync from:
 #	a specific host or from / to a whole subnet (see below)
 ;   remote browse sync = 192.168.3.25 192.168.5.255
+
 # Cause this host to announce itself to local subnets here
 ;   remote announce = 192.168.1.255 192.168.2.44
 
@@ -110,7 +141,7 @@
 # Domain Master specifies Samba to be the Domain Master Browser. This
 # allows Samba to collate browse lists between subnets. Don't use this
 # if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
+;   domain master = yes
 
 # Preferred Master causes Samba to force a local browser election on startup
 # and gives it a slightly higher chance of winning the election
@@ -120,8 +151,8 @@
 # configured at install time to be a primary domain controller.
 ;   domain controller = <NT-Domain-Controller-SMBName>
 
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
+# Enable this if you want Samba to be a domain logon server for
+# Windows95 workstations.
 ;   domain logons = yes
 
 # If you enable domain logons then you may want a per-machine or
@@ -147,7 +178,7 @@
 # The example below excludes use of name resolution for machines that are NOT
 # on the local network segment
 # - OR - are not deliberately to be known via lmhosts or via WINS.
-; name resolve order = wins lmhosts bcast
+;   name resolve order = wins lmhosts bcast
 
 # Windows Internet Name Serving Support Section:
 # WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
@@ -163,16 +194,17 @@
 ;   wins proxy = yes
 
 # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
-# this has been changed in version 1.9.18 to no.
-   dns proxy = no 
+# via DNS nslookups. The default is NO.
+   dns proxy = no
 
 # Case Preservation can be handy - system default is _no_
 # NOTE: These can be set on a per share basis
 ;  preserve case = no
 ;  short preserve case = no
+
 # Default case is normally upper case for all DOS files
 ;  default case = lower
+
 # Be very careful with case sensitivity - it can break things!
 ;  case sensitive = no
 
@@ -180,6 +212,16 @@
 # This option is ignored when Windows 9x client connects
    use sendfile = yes
 
+# These scripts are used on a domain controller or stand-alone
+# machine to add or delete corresponding unix accounts
+;  add user script = /usr/sbin/useradd %u
+;  add group script = /usr/sbin/groupadd %g
+;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
+;  delete user script = /usr/sbin/userdel %u
+;  delete user from group script = /usr/sbin/deluser %u %g
+;  delete group script = /usr/sbin/groupdel %g
+
+
 #============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
@@ -231,7 +273,7 @@
 ;   printable = no
 ;   write list = @staff
 
-# Other examples. 
+# Other examples.
 #
 # A private printer, usable only by fred. Spool data will be placed in fred's
 # home directory. Note that fred must have write access to the spool directory,
@@ -255,9 +297,9 @@
 ;   writable = yes
 ;   printable = no
 
-# A service which has a different directory for each machine that connects
+# a service which has a different directory for each machine that connects
 # this allows you to tailor configurations to incoming machines. You could
-# also use the %u option to tailor it by user name.
+# also use the %U option to tailor it by user name.
 # The %m gets replaced with the machine name that is connecting.
 ;[pchome]
 ;  comment = PC Directories
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/samba.git/commitdiff/8f2607b83208e9672972be90df9adb474f035876



More information about the pld-cvs-commit mailing list