daily autocommit

diff --git a/.etckeeper b/.etckeeper
index c51a9aa5ce1ac5a990d495a515817982f82e0f7c..6e10d40e9511bde497d9d9637437397d8d3cfb44 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -7368,6 +7368,7 @@ maybe chmod 0644 'letsencrypt/csr/3209_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3210_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3211_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3212_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3213_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -10583,6 +10584,7 @@ maybe chmod 0600 'letsencrypt/keys/3210_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3211_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3212_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3213_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3214_key-certbot.pem'
 maybe chmod 0755 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README'

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index eff97d63a026142ee377c4f2437abc440ecaa451..50b3a358ee28eb9cfe782f0f11098936b8172fd8 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -2,14 +2,14 @@
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-UUID urn:uuid:ea93d50c-2e22-3178-58fc-95b888afac54
+UUID urn:uuid:ea0cca34-9840-346e-6791-de8b33a2e299
 Info 
 Location 
 MakeModel Color LaserJet MFP M277dw
 DeviceURI ipp://NPI9D0E59.local:631/ipp/print
 State Idle
-StateTime 1642547575
-ConfigTime 1642547578
+StateTime 1642693154
+ConfigTime 1642693157
 Type 4188
 Accepting Yes
 Shared No

diff --git a/group b/group
index 82437ec454c222f648229773f30dcfd41155f05e..4e539253bbca70d277729cdc02804becaabd2e80 100644 (file)
--- a/group
+++ b/group
@@ -66,7 +66,6 @@ dovenull:x:127:
 postfix:x:128:
 postdrop:x:129:
 vmail:x:5000:
-remoteBackup:x:5001:
 ntp:x:130:
 git:x:1001:
 amavis:x:132:
@@ -99,7 +98,6 @@ lightdm:x:154:
 rdma:x:151:
 geoclue:x:155:
 lool:x:156:
-serverbackup:x:5003:
 autossh:x:5004:
 systemd-coredump:x:157:
 plex:x:158:
@@ -107,3 +105,4 @@ nelly:x:5005:
 Debian-snmp:x:121:
 cool:x:137:
 sambauser:x:997:
+borg:x:5006:

diff --git a/group- b/group-
index 4505c5ca69879f9f2442d783f8270bd63b463e7f..889d959f1738deb41b8068129a57573b2fc9ec95 100644 (file)
--- a/group-
+++ b/group-
@@ -45,7 +45,7 @@ messagebus:x:106:
 ssl-cert:x:107:
 lpadmin:x:108:mhoellein
 scanner:x:109:saned
-sambashare:x:110:mhoellein
+sambashare:x:110:mhoellein,sambauser
 vboxsf:x:111:
 mlocate:x:112:
 ssh:x:113:
@@ -66,7 +66,6 @@ dovenull:x:127:
 postfix:x:128:
 postdrop:x:129:
 vmail:x:5000:
-remoteBackup:x:5001:
 ntp:x:130:
 git:x:1001:
 amavis:x:132:
@@ -99,10 +98,10 @@ lightdm:x:154:
 rdma:x:151:
 geoclue:x:155:
 lool:x:156:
-serverbackup:x:5003:
 autossh:x:5004:
 systemd-coredump:x:157:
 plex:x:158:
 nelly:x:5005:
 Debian-snmp:x:121:
 cool:x:137:
+sambauser:x:997:

diff --git a/gshadow b/gshadow
index 188ea5f758f41c345b482b681ff2a48a2331e93d..7901480300ac81120ca0bb49c3a8463601ae1f16 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -66,7 +66,6 @@ dovenull:!::
 postfix:!::
 postdrop:!::
 vmail:!::
-remoteBackup:!::
 ntp:!::
 git:!::
 amavis:!::
@@ -99,7 +98,6 @@ lightdm:!::
 rdma:!::
 geoclue:!::
 lool:!::
-serverbackup:!::
 autossh:!::
 systemd-coredump:!::
 plex:!::
@@ -107,3 +105,4 @@ nelly:!::
 Debian-snmp:!::
 cool:!::
 sambauser:!::
+borg:!::

diff --git a/gshadow- b/gshadow-
index f398946553c0f99567a03a260d37b476973fd953..5986a2c5952b96df5e34432f2f39396b5990010e 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -45,7 +45,7 @@ messagebus:!::
 ssl-cert:!::
 lpadmin:!::mhoellein
 scanner:!::saned
-sambashare:!::mhoellein
+sambashare:!::mhoellein,sambauser
 vboxsf:!::
 mlocate:!::
 ssh:!::
@@ -66,7 +66,6 @@ dovenull:!::
 postfix:!::
 postdrop:!::
 vmail:!::
-remoteBackup:!::
 ntp:!::
 git:!::
 amavis:!::
@@ -99,10 +98,10 @@ lightdm:!::
 rdma:!::
 geoclue:!::
 lool:!::
-serverbackup:!::
 autossh:!::
 systemd-coredump:!::
 plex:!::
 nelly:!::
 Debian-snmp:!::
 cool:!::
+sambauser:!::

diff --git a/letsencrypt/csr/3213_csr-certbot.pem b/letsencrypt/csr/3213_csr-certbot.pem
new file mode 100644 (file)
index 0000000..6a070d3
--- /dev/null
+++ b/letsencrypt/csr/3213_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVX
+kkK/8S8Io7J43OVqIpxPfSRcdfhHR7Q9JwaUZz0f2Wuod68vOVOu/uN1X01LMXnz
+R8P8lvYUDCOkdjg2/33aOVbNVY1TOnmItWPa7U6tyizAfkI9X/UiZ98IOy53En+5
+PCGL3NplPm1Os6fTQrb/7m8sv4rJRFM+dwTv22D41tuaD7oE9mo4LCX/+PUO1wki
+uN7hNr7nQT+8CqGz5CQwr6RDu4pnXjF8X1I/sUC9zQ0W5/OTDLxnJVaeU3f7yag9
+z2Kfh9XYxWL65w53r0FhM4sENavW4REjKdHUsYjlu0zYBrTAEROAjKwrkV27+NFj
++SujcD85z9I3Sg+VD3UCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQA6GtzyfbmC
+lxYmSH8qz+5rMjuC/jtZ9LvPZHqQasL3+NRwMagbjeOnKx8T3GxzqOCzSakzgfam
+bO3vjJSapzJewaMzOGIG89uN34XyZhcmRyDRqMLm1RiTMy6MsZ7+TBZAsfNDTTOS
+rI85laxeYsWXMNgcIt+oCi94XE3ArteDBGf2sPhOC9PBzqOmitxhsoZxT54HHikE
+L6cnJGE4EDNOyz1DdeExzkpwHtdwb2B0KT3IBM39vST4Ved9YfAkA7yeFxOQvoh6
+YMD2UyTpsEcKbADQkVYwhimB9WIDy59idLmJKBH+p6WHDCmwyiK2BEWKAeLUzb/V
+Qig27zHcYtRj
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/3214_key-certbot.pem b/letsencrypt/keys/3214_key-certbot.pem
new file mode 100644 (file)
index 0000000..515df9f
--- /dev/null
+++ b/letsencrypt/keys/3214_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC1V5JCv/EvCKOy
+eNzlaiKcT30kXHX4R0e0PScGlGc9H9lrqHevLzlTrv7jdV9NSzF580fD/Jb2FAwj
+pHY4Nv992jlWzVWNUzp5iLVj2u1OrcoswH5CPV/1ImffCDsudxJ/uTwhi9zaZT5t
+TrOn00K2/+5vLL+KyURTPncE79tg+Nbbmg+6BPZqOCwl//j1DtcJIrje4Ta+50E/
+vAqhs+QkMK+kQ7uKZ14xfF9SP7FAvc0NFufzkwy8ZyVWnlN3+8moPc9in4fV2MVi
++ucOd69BYTOLBDWr1uERIynR1LGI5btM2Aa0wBETgIysK5Fdu/jRY/kro3A/Oc/S
+N0oPlQ91AgMBAAECggEAZ84AKHuNSTot0n0DHcP6mfWakhTnZr8O2arjyw1qZ3/y
+yoC+OibTLwcOWxAWBL3VTZSocRUHKUfihwier6Ez8UvY5MpXfbW11FogU0+/5fjv
+sVxjKfHOGxmd0fr5Pajliv1y4VUZkF7CNHoHtzrkhrLMPxGjd4Osu+YW5VmT/9aa
+linyx2dg3b8bBv1AuhcrZHYfTE28+bdvIwNPk06HHMfrx3dMDBFZ9tHEn9p+kJAW
+qrjoRGB0KpjmTFYzm3thVKxgXM+gTfq3RtkVpBJmbIWkLuXXmqHxzs77t/2Bfwgm
+9OXMKJ+zWtBQ0M0V6IvMv5BQY4oPDmSmyQvPMO2zpQKBgQDmUbQdO3GJmg4mghg8
+lPnJ5BUYSU8fIBLuMWZUX669iDCSRr3GHfv0zm3T7TxTrLG+HOzKKHd5qdAd+eqm
+y96TmAHdx31OhxBL9veFzLt8SioSZTN6sj/mCu4R90C5O8vhYrDiRwWp0Vob1zFS
+NfmcKBpp6jy2cghvc2LS/NVRawKBgQDJj9oUr9D7YMN5M/akKWHbuLMBzU7vnYsv
+vTO0SdN0v4hPUhs3FLjx7Qnk9hpWwQTrQA/kXjaWNhZusEVtZybHlWDD91o6JJju
+ILxjHKBVZJpFB/efllaz8OQOKfyT2yFGl6O4PvG2JXwsInNKq3hTuex2AEcCyYtH
+1WfK1P/6nwKBgGVNAFRvJcPo31puk+xpdegnimOxMry05b6gOarYnsm8Eej0dlmi
+LISDGulAie0fotnEbR2JaOs5FlFo751HQ/FUxVVffazBWRigWkQeRUQodpK6skbA
+CbzLh+SdBHm0ZDsQpk4QANytON3P62CGXvAg72UwYl24kB889/VmwQhbAoGADF93
+PKPaSUQUW8FT15nutuUsn+SxfsYGAEU2AlAx2c3UGUJqB0SPYdJyNArjbQXmPmat
+UxBxe2EQmXTani+h0siZqw3pDP6oIJ4D0nW0ZemKCsjFa5d39Q3JghETvyPJdCLk
+2u+KOOsuJytqNmA2P7V/DXNQ6Jvkn+E6wNm4aPMCgYAvZy5oz8xESum7UfrSycwo
+01okOXiMkG6x6SbDdR+MSTZR5MThUys2VGhYoVF3prmb8gBKk0I1yBsIXkcjtTGA
+n3Br1ncJnL6L3bopFcmiEJb3SokVfPB1LQl8L45j9GlO6adKvFpp/JWy7rwLTYWd
+1rDW3sUKBpc0wHik5nqeJw==
+-----END PRIVATE KEY-----

diff --git a/lvm/backup/system b/lvm/backup/system
index b2cb93e5e7a6d7597e4254394ec3c59f8ad35017..cc35c329851f088186d12ed91747803d3d320b30 100644 (file)
--- a/lvm/backup/system
+++ b/lvm/backup/system
@@ -1,16 +1,16 @@
-# Generated by LVM2 version 2.02.176(2) (2017-11-03): Thu Jan 20 00:19:45 2022
+# Generated by LVM2 version 2.02.176(2) (2017-11-03): Fri Jan 21 00:00:02 2022
 
 contents = "Text Format Volume Group"
 version = 1
 
-description = "Created *after* executing '/sbin/lvremove -y /dev/system/var_backup'"
+description = "Created *after* executing '/sbin/lvcreate -n var_backup -s /dev/system/var -L 10G'"
 
 creation_host = "homeserver"   # Linux homeserver 4.15.0-20-generic #21-Ubuntu SMP Tue Apr 24 06:16:15 UTC 2018 x86_64
-creation_time = 1642634385     # Thu Jan 20 00:19:45 2022
+creation_time = 1642719602     # Fri Jan 21 00:00:02 2022
 
 system {
        id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv"
-       seqno = 130
+       seqno = 136
        format = "lvm2"                 # informational
        status = ["RESIZEABLE", "READ", "WRITE"]
        flags = []
@@ -129,6 +129,126 @@ system {
                                ]
                        }
                }
+
+               root_backup {
+                       id = "gnT0IX-wJ7T-L4Q5-8tsQ-nPMR-Tu00-jYlrDF"
+                       status = ["READ", "WRITE"]
+                       flags = []
+                       creation_time = 1642719601      # 2022-01-21 00:00:01 +0100
+                       creation_host = "homeserver"
+                       segment_count = 1
+
+                       segment1 {
+                               start_extent = 0
+                               extent_count = 2560     # 10 Gigabytes
+
+                               type = "striped"
+                               stripe_count = 1        # linear
+
+                               stripes = [
+                                       "pv0", 41216
+                               ]
+                       }
+               }
+
+               home_backup {
+                       id = "gqYI8D-1T3Y-4k2D-o8YF-jF4J-p1Y2-jVHUIN"
+                       status = ["READ", "WRITE"]
+                       flags = []
+                       creation_time = 1642719602      # 2022-01-21 00:00:02 +0100
+                       creation_host = "homeserver"
+                       segment_count = 1
+
+                       segment1 {
+                               start_extent = 0
+                               extent_count = 2560     # 10 Gigabytes
+
+                               type = "striped"
+                               stripe_count = 1        # linear
+
+                               stripes = [
+                                       "pv0", 43776
+                               ]
+                       }
+               }
+
+               var_backup {
+                       id = "S3LDbL-o0U3-8pJY-cDNn-t9Zx-0aEt-OXob8A"
+                       status = ["READ", "WRITE"]
+                       flags = []
+                       creation_time = 1642719602      # 2022-01-21 00:00:02 +0100
+                       creation_host = "homeserver"
+                       segment_count = 1
+
+                       segment1 {
+                               start_extent = 0
+                               extent_count = 2560     # 10 Gigabytes
+
+                               type = "striped"
+                               stripe_count = 1        # linear
+
+                               stripes = [
+                                       "pv0", 46336
+                               ]
+                       }
+               }
+
+               snapshot0 {
+                       id = "OjcEeL-aGkn-cJLy-60AK-Jdo2-sAbr-W6dcec"
+                       status = ["READ", "WRITE", "VISIBLE"]
+                       flags = []
+                       creation_time = 1642719601      # 2022-01-21 00:00:01 +0100
+                       creation_host = "homeserver"
+                       segment_count = 1
+
+                       segment1 {
+                               start_extent = 0
+                               extent_count = 6400     # 25 Gigabytes
+
+                               type = "snapshot"
+                               chunk_size = 8
+                               origin = "root"
+                               cow_store = "root_backup"
+                       }
+               }
+
+               snapshot1 {
+                       id = "StvOLq-LPBe-A7sZ-3A0N-7KPe-e80E-4kB7SQ"
+                       status = ["READ", "WRITE", "VISIBLE"]
+                       flags = []
+                       creation_time = 1642719602      # 2022-01-21 00:00:02 +0100
+                       creation_host = "homeserver"
+                       segment_count = 1
+
+                       segment1 {
+                               start_extent = 0
+                               extent_count = 5120     # 20 Gigabytes
+
+                               type = "snapshot"
+                               chunk_size = 8
+                               origin = "home"
+                               cow_store = "home_backup"
+                       }
+               }
+
+               snapshot2 {
+                       id = "f5uOD0-nmEm-BVv3-CDD9-B8IV-nm06-Avdebt"
+                       status = ["READ", "WRITE", "VISIBLE"]
+                       flags = []
+                       creation_time = 1642719602      # 2022-01-21 00:00:02 +0100
+                       creation_host = "homeserver"
+                       segment_count = 1
+
+                       segment1 {
+                               start_extent = 0
+                               extent_count = 25600    # 100 Gigabytes
+
+                               type = "snapshot"
+                               chunk_size = 8
+                               origin = "var"
+                               cow_store = "var_backup"
+                       }
+               }
        }
 
 }

diff --git a/passwd b/passwd
index d984b872f8b8b6d3b7680da2d8852d345349a1b7..065e89c9835f27989ac8cfb9cc0898ff86147b26 100644 (file)
--- a/passwd
+++ b/passwd
@@ -40,7 +40,6 @@ fhem:x:999:20::/opt/fhem:/bin/false
 vmail:x:5000:5000::/home/vmail:
 sshd:x:121:65534::/var/run/sshd:/usr/sbin/nologin
 privoxy:x:122:65534::/etc/privoxy:/bin/false
-remoteBackup:x:5001:5001:User for backup from remote:/home/remoteBackup:
 iodine:x:123:65534::/var/run/iodine:/bin/false
 ntp:x:124:130::/home/ntp:/bin/false
 git:x:1001:1001:git,0,,:/home/git:/bin/bash
@@ -72,7 +71,6 @@ lightdm:x:147:154:Light Display Manager:/var/lib/lightdm:/bin/false
 cups-pk-helper:x:111:108:user for cups-pk-helper service,,,:/home/cups-pk-helper:/usr/sbin/nologin
 geoclue:x:148:155::/var/lib/geoclue:/usr/sbin/nologin
 lool:x:149:156::/opt/lool:/usr/sbin/nologin
-serverbackup:x:5003:5003::/home/serverbackup:/bin/bash
 autossh:x:5004:5004:ssh tunnel user:/var/lib/autossh:/bin/sh
 systemd-coredump:x:150:157:systemd core dump processing,,,:/run/systemd:/usr/sbin/nologin
 plex:x:151:158::/var/lib/plexmediaserver:/bin/bash
@@ -80,3 +78,4 @@ nelly:x:5005:5005:Nelly:/home/nelly:/bin/sh
 Debian-snmp:x:133:121::/var/lib/snmp:/bin/false
 cool:x:145:137::/opt/cool:/usr/sbin/nologin
 sambauser:x:997:997::/home/sambauser:/bin/false
+borg:x:5006:5006::/home/borg:/bin/bash

diff --git a/passwd- b/passwd-
index 6b224aabcb7108f861df295263a3a5dac72e0abf..f429e13a7692d9c29f33a703e7eb9eb575dc7ecb 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -40,7 +40,6 @@ fhem:x:999:20::/opt/fhem:/bin/false
 vmail:x:5000:5000::/home/vmail:
 sshd:x:121:65534::/var/run/sshd:/usr/sbin/nologin
 privoxy:x:122:65534::/etc/privoxy:/bin/false
-remoteBackup:x:5001:5001:User for backup from remote:/home/remoteBackup:
 iodine:x:123:65534::/var/run/iodine:/bin/false
 ntp:x:124:130::/home/ntp:/bin/false
 git:x:1001:1001:git,0,,:/home/git:/bin/bash
@@ -72,10 +71,10 @@ lightdm:x:147:154:Light Display Manager:/var/lib/lightdm:/bin/false
 cups-pk-helper:x:111:108:user for cups-pk-helper service,,,:/home/cups-pk-helper:/usr/sbin/nologin
 geoclue:x:148:155::/var/lib/geoclue:/usr/sbin/nologin
 lool:x:149:156::/opt/lool:/usr/sbin/nologin
-serverbackup:x:5003:5003::/home/serverbackup:/bin/bash
 autossh:x:5004:5004:ssh tunnel user:/var/lib/autossh:/bin/sh
 systemd-coredump:x:150:157:systemd core dump processing,,,:/run/systemd:/usr/sbin/nologin
 plex:x:151:158::/var/lib/plexmediaserver:/bin/bash
 nelly:x:5005:5005:Nelly:/home/nelly:/bin/sh
 Debian-snmp:x:133:121::/var/lib/snmp:/bin/false
 cool:x:145:137::/opt/cool:/usr/sbin/nologin
+sambauser:x:997:997::/home/sambauser:/bin/false

diff --git a/shadow b/shadow
index 9fd283634691ebbb9e45f88a894e799c9d84a06f..c661b6a8bbc30e2dee358b491e58150b049174d4 100644 (file)
--- a/shadow
+++ b/shadow
@@ -40,7 +40,6 @@ fhem:!:16866::::::
 vmail:!:16866:0:99999:7:::
 sshd:*:16867:0:99999:7:::
 privoxy:*:16870:0:99999:7:::
-remoteBackup:!:16884:0:99999:7:::
 iodine:*:16899:0:99999:7:::
 ntp:*:16911:0:99999:7:::
 git:$6$gfeQt4ff$PkSP9mwSdsZH1C0gl1Xd31/qPNC1OIBJ5jHy4MWEnW1EVNXIFMM5ARYjteOuM6Ot5TquBiyBzNnONEd9lRXQX/:16945:0:99999:7:::
@@ -72,7 +71,6 @@ lightdm:*:17827:0:99999:7:::
 cups-pk-helper:*:17827:0:99999:7:::
 geoclue:*:17827:0:99999:7:::
 lool:*:17828:0:99999:7:::
-serverbackup:$6$eaExedUs$qMxK2M5Q/pA6bz8crjGw1pESBnAFkus3IHDZTkCe1FFOw6LECghvQfM86zyNk.G4L5chDSgYeElHSvWgPIxJ.1:17841:0:99999:7:::
 autossh:!:17872:0:99999:7:::
 systemd-coredump:*:18049:0:99999:7:::
 plex:*:18115:0:99999:7:::
@@ -80,3 +78,4 @@ nelly:!:18355:0:99999:7:::
 Debian-snmp:!:18499:0:99999:7:::
 cool:*:18972:0:99999:7:::
 sambauser:!:19010::::::
+borg:!:19012:0:99999:7:::

diff --git a/shadow- b/shadow-
index dcdad2c3e9a6eb99f0c23ef4542789621eb6c4d7..ad701a8eddc381b0083108226e52db2c0b78cff7 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -40,7 +40,6 @@ fhem:!:16866::::::
 vmail:!:16866:0:99999:7:::
 sshd:*:16867:0:99999:7:::
 privoxy:*:16870:0:99999:7:::
-remoteBackup:!:16884:0:99999:7:::
 iodine:*:16899:0:99999:7:::
 ntp:*:16911:0:99999:7:::
 git:$6$gfeQt4ff$PkSP9mwSdsZH1C0gl1Xd31/qPNC1OIBJ5jHy4MWEnW1EVNXIFMM5ARYjteOuM6Ot5TquBiyBzNnONEd9lRXQX/:16945:0:99999:7:::
@@ -72,10 +71,10 @@ lightdm:*:17827:0:99999:7:::
 cups-pk-helper:*:17827:0:99999:7:::
 geoclue:*:17827:0:99999:7:::
 lool:*:17828:0:99999:7:::
-serverbackup:$6$eaExedUs$qMxK2M5Q/pA6bz8crjGw1pESBnAFkus3IHDZTkCe1FFOw6LECghvQfM86zyNk.G4L5chDSgYeElHSvWgPIxJ.1:17841:0:99999:7:::
 autossh:!:17872:0:99999:7:::
 systemd-coredump:*:18049:0:99999:7:::
 plex:*:18115:0:99999:7:::
 nelly:!:18355:0:99999:7:::
 Debian-snmp:!:18499:0:99999:7:::
 cool:*:18972:0:99999:7:::
+sambauser:!:19010::::::

diff --git a/subgid b/subgid
index 244a4da7320db0514386289bad8306ddb393c98a..1fcd88a2a2b28bd9839a4637e243f847ae89c577 100644 (file)
--- a/subgid
+++ b/subgid
@@ -1,9 +1,8 @@
 vmail:100000:65536
 mhoellein:165536:65536
-remoteBackup:231072:65536
 git:296608:65536
 door:362144:65536
 webssh:427680:65536
-serverbackup:493216:65536
 autossh:558752:65536
 nelly:624288:65536
+borg:231072:65536

diff --git a/subgid- b/subgid-
index fe085b9b1eb3ca5a13e824ff06a15a95f24ebbbb..02e6766d0b01bae41f55426cf74398d90e2363d7 100644 (file)
--- a/subgid-
+++ b/subgid-
@@ -1,8 +1,7 @@
 vmail:100000:65536
 mhoellein:165536:65536
-remoteBackup:231072:65536
 git:296608:65536
 door:362144:65536
 webssh:427680:65536
-serverbackup:493216:65536
 autossh:558752:65536
+nelly:624288:65536

diff --git a/subuid b/subuid
index 244a4da7320db0514386289bad8306ddb393c98a..1fcd88a2a2b28bd9839a4637e243f847ae89c577 100644 (file)
--- a/subuid
+++ b/subuid
@@ -1,9 +1,8 @@
 vmail:100000:65536
 mhoellein:165536:65536
-remoteBackup:231072:65536
 git:296608:65536
 door:362144:65536
 webssh:427680:65536
-serverbackup:493216:65536
 autossh:558752:65536
 nelly:624288:65536
+borg:231072:65536

diff --git a/subuid- b/subuid-
index fe085b9b1eb3ca5a13e824ff06a15a95f24ebbbb..02e6766d0b01bae41f55426cf74398d90e2363d7 100644 (file)
--- a/subuid-
+++ b/subuid-
@@ -1,8 +1,7 @@
 vmail:100000:65536
 mhoellein:165536:65536
-remoteBackup:231072:65536
 git:296608:65536
 door:362144:65536
 webssh:427680:65536
-serverbackup:493216:65536
 autossh:558752:65536
+nelly:624288:65536