From 528908a12f217d84d8669bba2852efa69e91abac Mon Sep 17 00:00:00 2001 From: frank Date: Wed, 25 Apr 2012 20:55:02 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- make.conf | 3 +- portage/package.use | 2 +- samba/smb.conf | 185 ----------------------------------------- samba/smb.conf.michael | 56 ------------- samba/smb.conf.orig | 184 ---------------------------------------- samba/smbusers | 8 -- 6 files changed, 3 insertions(+), 435 deletions(-) delete mode 100644 samba/smb.conf delete mode 100644 samba/smb.conf.michael delete mode 100644 samba/smb.conf.orig delete mode 100644 samba/smbusers diff --git a/make.conf b/make.conf index eed69c95..04f2b877 100644 --- a/make.conf +++ b/make.conf @@ -35,7 +35,8 @@ ACCEPT_LICENSE=" \ Oracle-BCLA-JavaSE \ " -EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10" +#EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10" +EMERGE_DEFAULT_OPTS="--with-bdeps y" CONFIG_PROTECT="/usr/share/xsessions \ /var/www/localhost/htdocs/phpmyadmin \ diff --git a/portage/package.use b/portage/package.use index 466b0eaa..2e9f9133 100644 --- a/portage/package.use +++ b/portage/package.use @@ -199,7 +199,7 @@ net-firewall/iptables extensions # =net-fs/nfs-utils-1.0.10 -kerberos #=net-fs/nfs-utils-1.0.12 -kerberos -net-fs/samba async automount quotas smbsharemodes swat syslog winbind +net-fs/samba async automount quota smbsharemodes swat syslog smbtav2 winbind net-fs/samba-libs smbsharemodes net-ftp/proftpd authfile ifsession opensslcrypt rewrite shaper sitemisc softquota vroot diff --git a/samba/smb.conf b/samba/smb.conf deleted file mode 100644 index 44444172..00000000 --- a/samba/smb.conf +++ /dev/null @@ -1,185 +0,0 @@ -#======================= Global Settings ===================================== -[global] - -; workgroup = Brehm - workgroup = HENNIG - netbios name = Bruni -; server string = %h - server string = %h - (Samba %v) - load printers = yes - printing = cups -; printcap name = cups - printcap name = /etc/printcap - cups options = raw -; printer admin = @adm -; printer admin = @"Domain Admins" - log file = /var/log/samba/log.%m - max log size = 5120 - log level = 2 passdb:5 auth:10 -; hosts allow = 10.12.11. 127. ::1 2001:6f8:1db7::/64 fe80::/64 2001:6f8:1c00:365::/64 - #guest account = pcguest - #map to guest = bad user - security = user -; password server = -; password server = * -; password level = 8 -; username level = 8 - encrypt passwords = true -; smb passwd file = /var/lib/samba/private/smbpasswd - passdb backend = tdbsam - lanman auth = yes -; unix password sync = Yes -; pam password change = yes -; passwd program = /usr/bin/passwd %u -; passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \ -;*passwd:*all*authentication*tokens*updated*successfully* -; username map = /etc/samba/smbusers -; include = /etc/samba/smb.conf.%m -; winbind separator = + -; winbind use default domain = yes -; template homedir = /home/%D/%U -; obey pam restrictions = yes -; template shell = /bin/bash - #socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 -; interfaces = eth0 eth1 10.12.11.0/24 - #interfaces = eth0 - interfaces = lo 10.12.11.0/24 172.20.1.0/24 -; remote browse sync = 192.168.3.25 192.168.5.255 -; remote browse sync = 10.12.11.255 -; remote announce = 192.168.1.255 192.168.2.44 -; remote announce = 10.12.11.255 -; local master = yes -; os level = 100 -; domain master = yes -; preferred master = yes -; domain logons = yes -; logon script = %m.bat -; logon script = %U.bat -; logon path = \\%L\Profiles\%U -; logon home = \\%L\%U\.profile -; enhanced browsing = yes - -; add user script = /usr/sbin/useradd -s /bin/false '%u' -; delete user script = /usr/sbin/userdel '%s' -; add user to group script = /usr/bin/gpasswd -a '%u' '%g' -; delete user from group script = /usr/bin/gpasswd -d '%u' '%g' -; set primary group script = /usr/sbin/usermod -g '%g' '%u' -; add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}' -; delete group script = /usr/sbin/groupdel '%g' - -; passdb backend = smbpasswd guest -; passdb backend = tdbsam smbpasswd guest -; passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest -; passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest - -; idmap uid = 10000-20000 -; idmap gid = 10000-20000 - -; name resolve order = wins lmhosts bcast - name resolve order = wins lmhosts bcast host - -; wins support = yes -; wins server = 10.12.11.2 2001:6f8:1db7::1 fe80::2e0:4cff:fe69:50b7 127.0.0.1 ::1 - -; wins server = w.x.y.z - -; wins proxy = yes - - dns proxy = no - -; preserve case = no -; short preserve case = no -; default case = lower -; case sensitive = no - - dos charset = 850 - unix charset = UTF-8 - - force create mode = 0644 - force directory mode = 0755 - create mask = 000 - directory mask = 000 - - follow symlinks = yes -; wide links = yes -; unix extensions = no - wide links = no - unix extensions = yes - - force group = users - - -#============================ Share Definitions ============================== -[homes] - comment = Home Directories - browseable = no - writable = yes - printable = no - create mask = 0664 - directory mask = 0775 -; vfs object = /usr/lib/samba/vfs/recycle.so - follow symlinks = yes - wide links = yes - public = no - - -;[netlogon] -; comment = Network Logon Service -; path = /var/lib/samba/netlogon -; guest ok = yes -; writable = no - -;[Profiles] -; path = /var/lib/samba/profiles -; browseable = no -; guest ok = yes -; root preexec = PROFILE=/var/lib/samba/profiles/%u; if [ ! -e $PROFILE ]; \ -; then mkdir -pm700 $PROFILE; chown %u:%g $PROFILE;fi - -[printers] - comment = Alle Drucker - path = /var/spool/samba - browseable = yes - guest ok = yes - writable = no - printable = yes - create mode = 0700 - printer admin = root, @lp - #print command = lpr-cups -P %p -o raw %s -r # using client side printer drivers. -; print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients). -; lpq command = lpq -P %p -; lprm command = cancel %p-%j - -#[print$] -# path = /var/lib/samba/printers -# browseable = yes -# read only = yes -# write list = @adm root -# guest ok = yes - -[all] - path = /data/all - browseable = yes - comment = Oeffentliches Zeug - #public = no - writable = no - write list = @users - printable = no - create mask = 0664 - directory mask = 0775 - guest ok = yes -# vfs object = /usr/lib/samba/vfs/audit.so - -[inst] - path = /data/inst - browseable = yes - comment = Installations-Dateien - public = yes - only guest = yes - writable = no - write list = @users - printable = no - force user = frank - create mask = 0664 - directory mask = 0775 - diff --git a/samba/smb.conf.michael b/samba/smb.conf.michael deleted file mode 100644 index e572d12a..00000000 --- a/samba/smb.conf.michael +++ /dev/null @@ -1,56 +0,0 @@ -[global] - - workgroup = ARBEITSGRUPPE - #server string = Samba %v - server string = Fileserver - netbios name = FILESERVER - interfaces = lo 10.1.0.0/24 - hosts allow = 127. 10.1.0. - name resolve order = wins lmhosts hosts - #socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE IPTOS_LOWDELAY - #socket options = TCP_NODELAY SO_RCVBUF=65520 SO_SNDBUF=65520 - #strict sync = yes - #sync always = yes - # This will prevent nmbd to search for NetBIOS names through DNS. - dns proxy = no - # fix umlaute when using windows clients - dos charset = 850 - unix charset = UTF-8 - force create mode = 0644 - force directory mode = 0755 - create mask = 000 - directory mask = 000 - security = user - passdb backend = tdbsam - # You may wish to use password encryption. See the section on - # 'encrypt passwords' in the smb.conf(5) manpage before enabling. - encrypt passwords = true - # disable printer support completely - load printers = no - cups options = raw - printcap name = /etc/printcap - printing = - # This tells Samba to use a separate log file for each machine - # that connects - log file = /var/log/samba/log.%m - # Put a capping on the size of the log files (in Kb). - max log size = 1000 - # We want Samba to log a minimum amount of information to syslog. Everything - # should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log - # through syslog you should set the following parameter to something higher. - syslog = 0 - # 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 - include = /etc/samba/smb.conf.%m -;/etc/samba/smb.conf.irgendeinhostname: -;[dms] -; comment = DMS -; path = /storage/antea/dms -; browseable = yes -; writable = yes -; valid users = mbalser -; force user = nobody -; force group = nogroup - -; vim: filetype=samba ts=4 expandtab diff --git a/samba/smb.conf.orig b/samba/smb.conf.orig deleted file mode 100644 index ba7dc10e..00000000 --- a/samba/smb.conf.orig +++ /dev/null @@ -1,184 +0,0 @@ -# This is the main Samba configuration file. You should read the -# smb.conf(5) manual page in order to understand the options listed -# 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) -# 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 made any basic syntactic errors. -# -#======================= Global Settings ===================================== -[global] - -; workgroup = Brehm - workgroup = Hennig - netbios name = Bruni -; netbios name = Brunhilde - server string = %h -; server string = %h - (Samba %v) - printcap name = cups - load printers = yes - printing = cups -; printer admin = @adm -; printer admin = @"Domain Admins" - log file = /var/log/samba/log.%m - max log size = 1024 - log level = 2 -; hosts allow = 10.12.11. 127. ::1 2001:6f8:1db7::/64 fe80::/64 2001:6f8:1c00:365::/64 -; guest account = pcguest - map to guest = bad user - security = user -; password server = -; password server = * -; password level = 8 -; username level = 8 - encrypt passwords = yes -; smb passwd file = /var/lib/samba/private/smbpasswd - passdb backend = tdbsam -; unix password sync = Yes -; pam password change = yes -; passwd program = /usr/bin/passwd %u -; passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \ -;*passwd:*all*authentication*tokens*updated*successfully* -; username map = /etc/samba/smbusers -; include = /etc/samba/smb.conf.%m -; winbind separator = + -; winbind use default domain = yes -; template homedir = /home/%D/%U -; obey pam restrictions = yes -; template shell = /bin/bash - socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 -; interfaces = eth0 eth1 10.12.11.0/24 - interfaces = eth1 -; remote browse sync = 192.168.3.25 192.168.5.255 -; remote browse sync = 10.12.11.255 -; remote announce = 192.168.1.255 192.168.2.44 -; remote announce = 10.12.11.255 - local master = yes - os level = 100 - domain master = yes - preferred master = yes -; domain logons = yes -; logon script = %m.bat -; logon script = %U.bat -; logon path = \\%L\Profiles\%U -; logon home = \\%L\%U\.profile - enhanced browsing = yes - -; add user script = /usr/sbin/useradd -s /bin/false '%u' -; delete user script = /usr/sbin/userdel '%s' -; add user to group script = /usr/bin/gpasswd -a '%u' '%g' -; delete user from group script = /usr/bin/gpasswd -d '%u' '%g' -; set primary group script = /usr/sbin/usermod -g '%g' '%u' -; add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}' -; delete group script = /usr/sbin/groupdel '%g' - -; passdb backend = smbpasswd guest -; passdb backend = tdbsam smbpasswd guest -; passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest -; passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest - -; idmap uid = 10000-20000 -; idmap gid = 10000-20000 - -; name resolve order = wins lmhosts bcast - name resolve order = wins lmhosts bcast host - -; wins support = yes -; wins server = 10.12.11.2 2001:6f8:1db7::1 fe80::2e0:4cff:fe69:50b7 127.0.0.1 ::1 - -; wins server = w.x.y.z - -; wins proxy = yes - - dns proxy = no - -; preserve case = no -; short preserve case = no -; default case = lower -; case sensitive = no - - dos charset = 850 - unix charset = UTF-8 - - follow symlinks = yes - wide links = yes - unix extensions = no - - -#============================ Share Definitions ============================== -[homes] - comment = Home Directories - browseable = yes - writable = yes - printable = no - create mask = 0664 - directory mask = 0775 -; vfs object = /usr/lib/samba/vfs/recycle.so - follow symlinks = yes - wide links = yes - public = no - - -;[netlogon] -; comment = Network Logon Service -; path = /var/lib/samba/netlogon -; guest ok = yes -; writable = no - -;[Profiles] -; path = /var/lib/samba/profiles -; browseable = no -; guest ok = yes -; root preexec = PROFILE=/var/lib/samba/profiles/%u; if [ ! -e $PROFILE ]; \ -; then mkdir -pm700 $PROFILE; chown %u:%g $PROFILE;fi - -[printers] - comment = Alle Drucker - path = /var/spool/samba - browseable = yes - guest ok = yes - writable = no - printable = yes - create mode = 0700 - #print command = lpr-cups -P %p -o raw %s -r # using client side printer drivers. -; print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients). -; lpq command = lpq -P %p -; lprm command = cancel %p-%j - -[print$] - path = /var/lib/samba/printers - browseable = yes - read only = yes - write list = @adm root - guest ok = yes - -[all] - path = /data/all - browseable = yes - comment = Oeffentliches Zeug - public = no - writable = no - write list = @users - printable = no - create mask = 0664 - directory mask = 0775 -; vfs object = /usr/lib/samba/vfs/audit.so - -[inst] - path = /data/inst - browseable = yes - comment = Installations-Dateien - public = no -; only guest = yes - writable = no - write list = @users - printable = no -; force user = frank - create mask = 0664 - directory mask = 0775 - diff --git a/samba/smbusers b/samba/smbusers deleted file mode 100644 index 85f82eea..00000000 --- a/samba/smbusers +++ /dev/null @@ -1,8 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/smbusers,v 1.1 2010/03/01 16:19:54 patrick Exp $ - -# Syntax: -# Unix_name = SMB_name1 SMB_name2 ... - -root = Administrator admin -nobody = guest pcguest smbguest -frank = frank -- 2.39.5