daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 957b3eef6419f0b66d3217cc39f3e28322d62d14..e18368f6fbcfff38229f140660f0121542efcecd 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -16,7 +16,6 @@ mkdir -p './cups/interfaces'
 mkdir -p './cups/ssl'
 mkdir -p './dbus-1/session.d'
 mkdir -p './dconf/db'
-mkdir -p './gadmin-samba'
 mkdir -p './glvnd/egl_vendor.d'
 mkdir -p './gss/mech.d'
 mkdir -p './guest-session'
@@ -1602,6 +1601,8 @@ maybe chmod 0644 'fwupd/uefi.conf'
 maybe chmod 0644 'fwupd/upower.conf'
 maybe chmod 0644 'g15daemon.conf'
 maybe chmod 0755 'gadmin-samba'
+maybe chmod 0600 'gadmin-samba/gadmin_samba_users'
+maybe chmod 0644 'gadmin-samba/settings.conf'
 maybe chmod 0644 'gai.conf'
 maybe chmod 0644 'gamemode.ini'
 maybe chmod 0755 'gconf'
@@ -2659,6 +2660,7 @@ maybe chmod 0755 'samba'
 maybe chmod 0644 'samba/gdbcommands'
 maybe chmod 0644 'samba/smb.conf'
 maybe chmod 0644 'samba/smb.conf.old.2018-07-11_21:11'
+maybe chmod 0644 'samba/smb.conf.old.2020-08-16_11-07'
 maybe chmod 0644 'samba/smb.conf.old.gadmin-samba-0.3.2'
 maybe chmod 0644 'samba/smbusers'
 maybe chmod 0755 'samba/tls'

diff --git a/gadmin-samba/gadmin_samba_users b/gadmin-samba/gadmin_samba_users
new file mode 100644 (file)
index 0000000..990e989
--- /dev/null
+++ b/gadmin-samba/gadmin_samba_users
@@ -0,0 +1,8 @@
+WARNING: The "client schannel" option is deprecated
+WARNING: The "server schannel" option is deprecated
+gast:1126:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:[U          ]:LCT-00000000:
+smbguest:1125:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:31D6CFE0D16AE931B73C59D7E0C089C0:[DU         ]:LCT-5B465537:
+frank:1000:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:40466DE3A1B5123841BCD7B3DDCEFC00:[U          ]:LCT-5CE11D2C:
+doris:1003:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:C7104E8E880D921BB0B0FF1E3EC67D15:[U          ]:LCT-5BC50FEB:
+root:0:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:40466DE3A1B5123841BCD7B3DDCEFC00:[U          ]:LCT-5BC4FB38:
+heiko:1005:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:204C164E6E3EE7D282EFCBFC3F0BC0A6:[U          ]:LCT-5B707065:

diff --git a/gadmin-samba/settings.conf b/gadmin-samba/settings.conf
new file mode 100644 (file)
index 0000000..b38b9c9
--- /dev/null
+++ b/gadmin-samba/settings.conf
@@ -0,0 +1 @@
+show_conf_question: false

diff --git a/group b/group
index c96b267cd670c4c95042fa1fae04931241c7c23a..f4b9f06471a8ffeb29b5f6000fdd1458d1740bf9 100644 (file)
--- a/group
+++ b/group
@@ -92,3 +92,4 @@ render:x:148:
 tss:x:149:
 _flatpak:x:150:
 systemd-timesync:x:999:
+sambamachines:x:1127:

diff --git a/group- b/group-
index 76b3be5b27391bc60cbb7af0154b597dccf86628..c96b267cd670c4c95042fa1fae04931241c7c23a 100644 (file)
--- a/group-
+++ b/group-
@@ -91,3 +91,4 @@ tcpdump:x:147:
 render:x:148:
 tss:x:149:
 _flatpak:x:150:
+systemd-timesync:x:999:

diff --git a/gshadow b/gshadow
index f3f5a17877de77c9d9797be32b4faa33d54364c1..ced9c75c6d238511d1168c5a0b82ed6d35a99b3c 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -92,3 +92,4 @@ render:!::
 tss:!::
 _flatpak:!::
 systemd-timesync:!!::
+sambamachines:!::

diff --git a/gshadow- b/gshadow-
index ddc679c216f874ffec31c2178b7452fafcd4a29d..f3f5a17877de77c9d9797be32b4faa33d54364c1 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -91,3 +91,4 @@ tcpdump:!::
 render:!::
 tss:!::
 _flatpak:!::
+systemd-timesync:!!::

diff --git a/samba/smb.conf.old.2020-08-16_11-07 b/samba/smb.conf.old.2020-08-16_11-07
new file mode 100644 (file)
index 0000000..dd99a04
--- /dev/null
+++ b/samba/smb.conf.old.2020-08-16_11-07
@@ -0,0 +1,194 @@
+
+[global]
+;      netbios name = Bruni
+       server string = Samba file and print server
+       workgroup = HENNIG
+       client min protocol = SMB2
+       client max protocol = SMB3
+       security = user
+       idmap config *                : backend = tdb
+       idmap config *                : range   = 1000000-1999999
+       idmap config HENNIG           : backend = rid
+               idmap config HENNIG           : range   = 10000 - 49999
+       idmap config MicrosoftAccount : backend = rid
+               idmap config MicrosoftAccount : range   = 10000 - 49999
+
+;      hosts allow = 127. 192.168.0.
+;      interfaces = 127.0.0.1/8 192.168.0.0/24
+;      bind interfaces only = yes
+;      remote announce = 192.168.0.255
+;      remote browse sync = 192.168.0.255
+       printcap name = cups
+;      load printers = yes
+       cups options = raw
+;      printing = cups
+       guest account = gast
+       log file = /var/log/samba/samba.log
+       ;max log size = 5120
+       max log size = 0
+       #null passwords = no
+       username level = 6
+       #password level = 6
+;      encrypt passwords = yes
+       unix password sync = yes
+       #socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
+;      socket options = TCP_NODELAY
+       local master = no
+       domain master = no
+       preferred master = no
+;      domain logons = no
+       os level = 33
+       #logging = syslog@2 file
+       #log level = 3 passdb:10 auth:10
+       log level = 2
+       logon drive = m:
+       logon home = \\%L\homes\%u
+       logon path = \\%L\profiles\%u
+       logon script = %G.bat
+;      time server = no
+       name resolve order = wins lmhosts bcast
+       wins support = yes
+;      wins proxy = no
+       dns proxy = no
+;      preserve case = yes
+;      short preserve case = yes
+       client use spnego = no
+       client signing = no
+       client schannel = no
+       server signing = no
+       server schannel = no
+;      nt pipe support = yes
+;      nt status support = yes
+       allow trusted domains = no
+       obey pam restrictions = yes
+       #enable spoolss = yes
+;      client plaintext auth = no
+;      disable netbios = no
+       follow symlinks = no
+       #update encrypted = yes
+;      pam password change = no
+       passwd chat timeout = 120
+;      hostname lookups = no
+       username map = /etc/samba/smbusers
+       passdb backend = tdbsam
+       passwd program = /usr/bin/passwd '%u'
+       passwd chat = *New*password* %n\n *ReType*new*password* %n\n *passwd*changed*\n
+       add user script = /usr/sbin/useradd -d /dev/null -c 'Samba User Account' -s /dev/null '%u'
+       add user to group script = /usr/sbin/useradd -d /dev/null -c 'Samba User Account' -s /dev/null -g '%g' '%u'
+       add group script = /usr/sbin/groupadd '%g'
+       delete user script = /usr/sbin/userdel '%u'
+       delete user from group script = /usr/sbin/userdel '%u' '%g'
+       delete group script = /usr/sbin/groupdel '%g'
+       add machine script = /usr/sbin/useradd -d /dev/null -g sambamachines -c 'Samba Machine Account' -s /dev/null -M '%u'
+       machine password timeout = 120
+       #idmap uid = 16777216-33554431
+       #idmap gid = 16777216-33554431
+       template shell = /dev/null
+       winbind use default domain = yes
+       winbind separator = @
+       winbind cache time = 360
+;      winbind trusted domains only = yes
+       winbind nested groups = no
+       winbind nss info = no
+;      winbind refresh tickets = no
+;      winbind offline logon = no
+       force group = users
+       guest ok = yes
+
+[homes]
+       comment = Home Directories
+       path = /home
+       valid users = %U
+       read only = no
+;      available = yes
+;      browseable = yes
+;      guest ok = no
+;      printable = no
+       locking = no
+       strict locking = no
+       create mask = 0664
+       directory mask = 0775
+;      follow symlinks = yes
+
+[netlogon]
+       comment = Network Logon Service
+       path = /var/lib/samba/netlogon
+       read only = no
+;      available = yes
+;      browseable = yes
+;      guest ok = no
+;      printable = no
+       locking = no
+       strict locking = no
+
+[profiles]
+       comment = Nutzer Profile
+       path = /var/lib/samba/profiles
+       read only = no
+;      available = yes
+;      browseable = yes
+;      guest ok = no
+;      printable = no
+       create mode = 0600
+       directory mask = 0700
+       locking = no
+       strict locking = no
+
+[printers]
+       comment = Alle Drucker
+       path = /var/spool/samba
+;      browseable = yes
+;      writable = no
+;      guest ok = no
+       printable = yes
+       locking = no
+       strict locking = no
+
+[pdf-documents]
+       path = /var/lib/samba/pdf-documents
+       comment = Converted PDF Documents
+       admin users = %U
+;      available = yes
+;      browseable = yes
+       writeable = yes
+       guest ok = yes
+       locking = no
+       strict locking = no
+
+[pdf-printer]
+       path = /tmp
+       comment = PDF Printer Service
+       printable = yes
+       guest ok = yes
+       use client driver = yes
+       printing = bsd
+       print command = /usr/bin/gadmin-samba-pdf %s %u
+       lpq command = 
+       lprm command = 
+
+[all]
+       path = /data/all
+;      browseable = yes
+       comment = Oeffentliches Zeug
+        #public = no
+       writeable = yes
+       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/smbusers b/samba/smbusers
index 220f1e1fea93136550c25bf41afb4d9a0370f0f5..be71e178ca3adccb929657cf098e357cc95ad503 100644 (file)
--- a/samba/smbusers
+++ b/samba/smbusers
@@ -1,4 +1,3 @@
 # Unix_name = SMB_Name1 SMB_Name2 ...
-root = Administrator admin
+root = administrator
 nobody = guest smbguest pcguest
-#frank = frank [MicrosoftAccount]\[frank]@[XENA] [MicrosoftAccount]\[frank]