]> git.hoellein.online Git - homeserver/commitdiff
saving uncommitted changes in /etc prior to apt run
authormhoellein <mhoellein@freenet.de>
Mon, 2 May 2022 11:49:19 +0000 (13:49 +0200)
committermhoellein <mhoellein@freenet.de>
Mon, 2 May 2022 11:49:19 +0000 (13:49 +0200)
1  2 
.etckeeper
cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd
cups/printers.conf
cups/printers.conf.O
letsencrypt/csr/3428_csr-certbot.pem
letsencrypt/keys/3429_key-certbot.pem
lvm/backup/system

diff --cc .etckeeper
index c19e8c8ec4b20729ac1fefcca1a7b16738e3754b,d0d3874ead322e45bc86e27a19f1835cc35b2ddd..19b88ebda0920e36161d74428790c24d4e8c4bcd
@@@ -765,7 -791,7 +788,7 @@@ maybe chmod 0644 'apt/apt.conf.d/00reco
  maybe chmod 0664 'apt/apt.conf.d/00trustcdrom'
  maybe chmod 0644 'apt/apt.conf.d/01-vendor-ubuntu'
  maybe chmod 0644 'apt/apt.conf.d/01autoremove'
--maybe chmod 0444 'apt/apt.conf.d/01autoremove-kernels'
++maybe chmod 0644 'apt/apt.conf.d/01autoremove-kernels'
  maybe chmod 0644 'apt/apt.conf.d/05etckeeper'
  maybe chmod 0644 'apt/apt.conf.d/10periodic'
  maybe chmod 0644 'apt/apt.conf.d/15update-stamp'
@@@ -2105,12 -2130,14 +2130,10 @@@ maybe chgrp 'lp' 'cups/ppd/HP_Color_Las
  maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd'
  maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O'
  maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O'
--maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd'
--maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd'
 -maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O'
 -maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O'
--maybe chgrp 'lp' 'cups/printers.conf'
--maybe chmod 0600 'cups/printers.conf'
--maybe chgrp 'lp' 'cups/printers.conf.O'
--maybe chmod 0600 'cups/printers.conf.O'
++maybe chmod 0644 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd'
++maybe chmod 0644 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O'
++maybe chmod 0644 'cups/printers.conf'
++maybe chmod 0644 'cups/printers.conf.O'
  maybe chmod 0644 'cups/raw.convs'
  maybe chmod 0644 'cups/raw.types'
  maybe chmod 0644 'cups/snmp.conf'
@@@ -11089,7 -11129,10 +11129,10 @@@ maybe chmod 0600 'letsencrypt/keys/3425
  maybe chmod 0600 'letsencrypt/keys/3426_key-certbot.pem'
  maybe chmod 0600 'letsencrypt/keys/3427_key-certbot.pem'
  maybe chmod 0600 'letsencrypt/keys/3428_key-certbot.pem'
--maybe chmod 0600 'letsencrypt/keys/3429_key-certbot.pem'
 -maybe chmod 0600 'letsencrypt/keys/3430_key-certbot.pem'
 -maybe chmod 0600 'letsencrypt/keys/3431_key-certbot.pem'
 -maybe chmod 0600 'letsencrypt/keys/3432_key-certbot.pem'
++maybe chmod 0644 'letsencrypt/keys/3429_key-certbot.pem'
++maybe chmod 0644 'letsencrypt/keys/3430_key-certbot.pem'
++maybe chmod 0644 'letsencrypt/keys/3431_key-certbot.pem'
++maybe chmod 0644 'letsencrypt/keys/3432_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'
@@@ -11217,6 -11264,8 +11264,7 @@@ maybe chmod 0644 'logrotate.d/icinga2
  maybe chmod 0644 'logrotate.d/iptraf'
  maybe chmod 0644 'logrotate.d/iptraf-ng'
  maybe chmod 0644 'logrotate.d/lightdm'
 -maybe chmod 0644 'logrotate.d/mosquitto'
+ maybe chmod 0644 'logrotate.d/mintupdate'
  maybe chmod 0644 'logrotate.d/mysql-server'
  maybe chmod 0644 'logrotate.d/oscam'
  maybe chmod 0644 'logrotate.d/php7.2-fpm'
@@@ -11254,7 -11304,7 +11303,7 @@@ maybe chmod 0700 'lvm/archive
  maybe chmod 0700 'lvm/backup'
  maybe chmod 0600 'lvm/backup/VG-sda1'
  maybe chmod 0600 'lvm/backup/mmc'
--maybe chmod 0600 'lvm/backup/system'
++maybe chmod 0644 'lvm/backup/system'
  maybe chmod 0644 'lvm/lvm.conf'
  maybe chmod 0644 'lvm/lvmlocal.conf'
  maybe chmod 0755 'lvm/profile'
@@@ -11347,8 -11405,13 +11396,13 @@@ maybe chmod 0644 'mysql/conf.d/mysqld_s
  maybe chmod 0644 'mysql/conf.d/mysqldump.cnf'
  maybe chmod 0755 'mysql/debian-start'
  maybe chmod 0600 'mysql/debian.cnf'
 -maybe chmod 0600 'mysql/debian.cnf-10.3'
++maybe chmod 0644 'mysql/debian.cnf-10.3'
  maybe chmod 0644 'mysql/mariadb.cnf'
  maybe chmod 0755 'mysql/mariadb.conf.d'
+ maybe chmod 0644 'mysql/mariadb.conf.d/50-client.cnf'
+ maybe chmod 0644 'mysql/mariadb.conf.d/50-mysql-clients.cnf'
+ maybe chmod 0644 'mysql/mariadb.conf.d/50-mysqld_safe.cnf'
+ maybe chmod 0644 'mysql/mariadb.conf.d/50-server.cnf'
  maybe chmod 0644 'mysql/my.cnf.bak'
  maybe chmod 0644 'mysql/my.cnf.fallback'
  maybe chmod 0644 'mysql/my.cnf.migrated'
@@@ -12477,7 -12551,7 +12540,7 @@@ maybe chmod 0440 'sudoers
  maybe chmod 0755 'sudoers.d'
  maybe chmod 0440 'sudoers.d/0pwfeedback'
  maybe chmod 0440 'sudoers.d/README'
--maybe chmod 0440 'sudoers.d/mintupdate'
++maybe chmod 0644 'sudoers.d/mintupdate'
  maybe chmod 0440 'sudoers.d/x2goserver'
  maybe chmod 0644 'sysctl.conf'
  maybe chmod 0755 'sysctl.d'
index 51d789741f7b4295d5928cd3572a504831192b0e,8403c2714cb61f0fd7daf95d9dc7f706fa0f534a..e23744fff8754aa5620e3d76ca511bd6a1146a92
  *PageSize 100x150mm/100 x 150mm: "<</PageSize[283.464566929134 425.196850393701]>>setpagedevice"
  *PageSize 184x260mm: "<</PageSize[521.574803149606 737.007874015748]>>setpagedevice"
  *PageSize 195x270mm: "<</PageSize[552.755905511811 765.354330708661]>>setpagedevice"
++<<<<<<< HEAD
 +*PageSize 4x6/4 x 6": "<</PageSize[288 432]>>setpagedevice"
 +*PageSize 5x8/5 x 8": "<</PageSize[360 576]>>setpagedevice"
++=======
+ *PageSize 4x6/4 x 6″: "<</PageSize[288 432]>>setpagedevice"
+ *PageSize 5x8/5 x 8″: "<</PageSize[360 576]>>setpagedevice"
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
  *PageSize A4/A4: "<</PageSize[595.275590551181 841.889763779528]>>setpagedevice"
  *PageSize A5/A5: "<</PageSize[419.527559055118 595.275590551181]>>setpagedevice"
  *PageSize A6/A6: "<</PageSize[297.637795275591 419.527559055118]>>setpagedevice"
  *PageSize B5/JIS B5: "<</PageSize[515.905511811024 728.503937007874]>>setpagedevice"
  *PageSize B6/JIS B6: "<</PageSize[362.834645669291 515.905511811024]>>setpagedevice"
  *PageSize DoublePostcardRotated/Oufuku Reply Postcard: "<</PageSize[419.527559055118 566.929133858268]>>setpagedevice"
++<<<<<<< HEAD
 +*PageSize Env10/#10 Envelope: "<</PageSize[296.985826771654 684]>>setpagedevice"
 +*PageSize EnvC5/C5 Envelope: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
 +*PageSize EnvDL/DL Envelope: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
 +*PageSize EnvMonarch/Monarch Envelope: "<</PageSize[278.985826771654 540]>>setpagedevice"
 +*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
 +*PageSize FanFoldGermanLegal/Foolscap: "<</PageSize[612 936]>>setpagedevice"
 +*PageSize ISOB5/B5 Envelope: "<</PageSize[498.897637795276 708.661417322835]>>setpagedevice"
 +*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
 +*PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
 +*PageSize Oficio/8.5 x 13.4": "<</PageSize[612 964.8]>>setpagedevice"
++=======
+ *PageSize Env10/Envelope #10: "<</PageSize[296.985826771654 684]>>setpagedevice"
+ *PageSize EnvC5/CEnvelope 5: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
+ *PageSize EnvDL/Envelope DL: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
+ *PageSize EnvMonarch/Envelope Monarch: "<</PageSize[278.985826771654 540]>>setpagedevice"
+ *PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
+ *PageSize FanFoldGermanLegal/Foolscap: "<</PageSize[612 936]>>setpagedevice"
+ *PageSize ISOB5/Envelope B5: "<</PageSize[498.897637795276 708.661417322835]>>setpagedevice"
+ *PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
+ *PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
+ *PageSize Oficio/8.5 x 13.4″: "<</PageSize[612 964.8]>>setpagedevice"
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
  *PageSize Postcard/Hagaki: "<</PageSize[283.464566929134 419.527559055118]>>setpagedevice"
  *PageSize roc16k/ROC 16k: "<</PageSize[558 774]>>setpagedevice"
  *CloseUI: *PageSize
  *PageRegion 100x150mm/100 x 150mm: "<</PageSize[283.464566929134 425.196850393701]>>setpagedevice"
  *PageRegion 184x260mm: "<</PageSize[521.574803149606 737.007874015748]>>setpagedevice"
  *PageRegion 195x270mm: "<</PageSize[552.755905511811 765.354330708661]>>setpagedevice"
++<<<<<<< HEAD
 +*PageRegion 4x6/4 x 6": "<</PageSize[288 432]>>setpagedevice"
 +*PageRegion 5x8/5 x 8": "<</PageSize[360 576]>>setpagedevice"
++=======
+ *PageRegion 4x6/4 x 6″: "<</PageSize[288 432]>>setpagedevice"
+ *PageRegion 5x8/5 x 8″: "<</PageSize[360 576]>>setpagedevice"
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
  *PageRegion A4/A4: "<</PageSize[595.275590551181 841.889763779528]>>setpagedevice"
  *PageRegion A5/A5: "<</PageSize[419.527559055118 595.275590551181]>>setpagedevice"
  *PageRegion A6/A6: "<</PageSize[297.637795275591 419.527559055118]>>setpagedevice"
  *PageRegion B5/JIS B5: "<</PageSize[515.905511811024 728.503937007874]>>setpagedevice"
  *PageRegion B6/JIS B6: "<</PageSize[362.834645669291 515.905511811024]>>setpagedevice"
  *PageRegion DoublePostcardRotated/Oufuku Reply Postcard: "<</PageSize[419.527559055118 566.929133858268]>>setpagedevice"
++<<<<<<< HEAD
 +*PageRegion Env10/#10 Envelope: "<</PageSize[296.985826771654 684]>>setpagedevice"
 +*PageRegion EnvC5/C5 Envelope: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
 +*PageRegion EnvDL/DL Envelope: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
 +*PageRegion EnvMonarch/Monarch Envelope: "<</PageSize[278.985826771654 540]>>setpagedevice"
 +*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
 +*PageRegion FanFoldGermanLegal/Foolscap: "<</PageSize[612 936]>>setpagedevice"
 +*PageRegion ISOB5/B5 Envelope: "<</PageSize[498.897637795276 708.661417322835]>>setpagedevice"
 +*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
 +*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
 +*PageRegion Oficio/8.5 x 13.4": "<</PageSize[612 964.8]>>setpagedevice"
++=======
+ *PageRegion Env10/Envelope #10: "<</PageSize[296.985826771654 684]>>setpagedevice"
+ *PageRegion EnvC5/CEnvelope 5: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
+ *PageRegion EnvDL/Envelope DL: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
+ *PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[278.985826771654 540]>>setpagedevice"
+ *PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
+ *PageRegion FanFoldGermanLegal/Foolscap: "<</PageSize[612 936]>>setpagedevice"
+ *PageRegion ISOB5/Envelope B5: "<</PageSize[498.897637795276 708.661417322835]>>setpagedevice"
+ *PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
+ *PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
+ *PageRegion Oficio/8.5 x 13.4″: "<</PageSize[612 964.8]>>setpagedevice"
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
  *PageRegion Postcard/Hagaki: "<</PageSize[283.464566929134 419.527559055118]>>setpagedevice"
  *PageRegion roc16k/ROC 16k: "<</PageSize[558 774]>>setpagedevice"
  *CloseUI: *PageRegion
index e15e98713652e44003dfc7b6229ed68d3cb0c4fd,ce044959a03a3f88bdea24d2af89b2288a858662..c8890fc2ae70e65020180cb825041d6256f520d4
@@@ -2,33 -2,33 +2,63 @@@
  # Written by cupsd
  # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
  <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
++<<<<<<< HEAD
 +UUID urn:uuid:b89eca21-fb25-3f10-483b-b060c6ca3210
 +Info HP_Color_LaserJet_MFP_M277dw_9D0E59_
 +MakeModel Color LaserJet MFP M277dw
 +DeviceURI ipp://NPI9D0E59.local:631/ipp/print
 +State Idle
 +StateTime 1650925011
 +ConfigTime 1651351488
 +Type 4188
++=======
+ UUID urn:uuid:eb25fb10-fb06-3141-7db1-2a5d2b9246c2
+ Info HP_Color_LaserJet_MFP_M277dw_9D0E59_
+ MakeModel Color LaserJet MFP M277dw
+ DeviceURI ipps://NPI9D0E59.local:443/ipp/print
+ State Idle
+ StateTime 1651061482
+ ConfigTime 1651137013
+ Type 4188
+ Accepting Yes
+ Shared No
+ JobSheets none none
+ QuotaPeriod 0
+ PageLimit 0
+ KLimit 0
+ OpPolicy default
+ ErrorPolicy retry-job
+ </Printer>
+ <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local>
+ UUID urn:uuid:05c08d2e-f0d3-3519-574b-43e75d9e5c79
+ Info 
+ Location 
+ MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2
+ DeviceURI ipp://NPI9D0E59.local:631/ipp/print
+ State Idle
+ StateTime 1651137594
+ ConfigTime 1651137594
+ Type 8425564
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
 +Accepting Yes
 +Shared No
 +JobSheets none none
 +QuotaPeriod 0
 +PageLimit 0
 +KLimit 0
 +OpPolicy default
 +ErrorPolicy retry-job
 +</Printer>
 +<Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local>
 +UUID urn:uuid:42ff3b52-8793-36d5-6bf3-2d9b91601e9e
 +Info 
 +Location 
 +MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2
 +DeviceURI ipps://NPI9D0E59.local:443/ipp/print
 +State Idle
 +StateTime 1651442881
 +ConfigTime 1651442881
 +Type 8425564
  Accepting Yes
  Shared No
  JobSheets none none
index be3fe0fe04c70ae1d797c5fcf4a78ea1957f331c,845be671edd78a220242ca9b4504f31208857885..ac2e454e7db1accbe2af2f7cc573a8057475781a
@@@ -2,13 -2,14 +2,24 @@@
  # Written by cupsd
  # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
  <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
++<<<<<<< HEAD
 +UUID urn:uuid:b89eca21-fb25-3f10-483b-b060c6ca3210
 +Info HP_Color_LaserJet_MFP_M277dw_9D0E59_
 +MakeModel Color LaserJet MFP M277dw
 +DeviceURI ipp://NPI9D0E59.local:631/ipp/print
 +State Idle
 +StateTime 1650925011
 +ConfigTime 1651351488
++=======
+ UUID urn:uuid:eb25fb10-fb06-3141-7db1-2a5d2b9246c2
+ Info 
+ Location 
+ MakeModel Color LaserJet MFP M277dw
+ DeviceURI ipps://NPI9D0E59.local:443/ipp/print
+ State Idle
+ StateTime 1651061482
+ ConfigTime 1651137013
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
  Type 4188
  Accepting Yes
  Shared No
index 62b3b36986c1b69f970cdf515fabb0d4af4043f0,f37cddcbecb7b0ce5853e682a11ecb39379d8930..0954013acc10d6660322bc9667835144e38e7770
@@@ -1,16 -1,16 +1,33 @@@
  -----BEGIN CERTIFICATE REQUEST-----
++<<<<<<< HEAD
 +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMF5
 +mYTDNZ0J4xuyUgAp1GEgP5N1UlHwhfobgJ4oxU+XH8Db2O16SlHYQxrWaL6824PM
 +NTzJ+EMYM1hYpxScwZR1+nk/zLvrvwjhQboivpEVks/yOr4W760xsQuH7kTIVjls
 +re1bYYR+0GdfBYxdkhcsQOU105okaAwxGltx2eiUPuwbfT59HyHj/iAuc3J3YI8o
 +VSGn1zxgP8esnTTsB+e/822VDa9BCx1WAFQB4aqebTYl1wMqGVedWr5XMgVED3vt
 +dOIdAz42KNwQ7Ko7UXBqCv5FDVGgR1MH1Wdtb1JMI8sxM1InDbmPEmvnXj0Adstz
 +BkSXoS3fGRQ8Uq62eN8CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
 +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQBNAD/TphVc
 +PMa85RGAkDd38v05Z9l3kJ3Hxi7z3W/WLpUE6yBfxkKwpbGvp0zOMVDbWH23SudH
 +1YUS3lIhu09WMxpCfm1bQjVbH/3wSMy5VeLQ8z8L13SZxdvf4XamV+P2msxvzPUC
 +8BY2eriI7vb/yNvhTBECk3HrKl1TGfuCuVT05mZIBmTh+t4A9hJkbNb4R8BDHiEp
 +0VZYgUeX5ozCH4Sf/2LQqAhWjk+4WY6+mFIn2IidrNTDT+pd3jV0zdvGtDbsEYs/
 +cyxZYK9c6vvL2pnCI/tdrIiwb0iDSMSUuMDdNi3d7mr5CiY+lHPd3Ng9vfvdtDD2
 +3agFACwodrxT
++=======
+ MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM0O
+ cBqoiEBZzXnY/OTiCU47Y7Qple0Ajhdy1sfh5TLtwIKUEyPwUmSs0yWawPiAMBGu
+ 7l6vB5YKa+aY8B5au8J2Uh7gqdq7qt3VlXg8nBYZRZv1+cW3sSazoUVBwI+m9e2X
+ 8sKE0SBa+sYSqzb0kgJyG2PVyOefOyJekm0lk0XYwGD3iJiM6AzAG8AM6r98IH+g
+ fbP6OYG52v8p2ekOAbQuUKAF0g2awtNvTrO5gFOQ0foCn+4Cis1GXlWuj1wyeDgl
+ ds/YqOVwuhUhnrNjRN5GQAa9GUJ0OcFFBpk719tuiCQtIAHkSkT4l9Ydai5LN7Ep
+ ek6iULJE8RnXPXV0u4cCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+ FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCFtDzeFMWd
+ 6gyY7iTHHUmPODZEdpRJsO6/VqQrKCd4vnRmiKHPuXRyOrx4kFZFufEN3Mv8/mDZ
+ bGAXaQR1e5u4F3anark3BCDJ+wpcps71GV4MTsT/p5lZ8QW3Nr0NTC4NPYPE9z4X
+ 25CoIdXrF9R3kzMLS62bQJtLqctCrgKhz34Vhdu06Ds/xKXTOBCm6RnZc2lEV8OW
+ wNnGKVgPGpefXVfXrPMawtjRR7yrKpcV0oduOc9NhHY3AwvtLKbpPte0+sVpPTL4
+ MSc+FONCBohFS01PUWSAbLtOeDYVnjoYraFPtOiKtV3glvWnhWX/3wYClP5+CAIF
+ k/0EedqXiT/q
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
  -----END CERTIFICATE REQUEST-----
index 346f62b86cf558ccc86db5c332c791268909de18,0d48432171d4d79fd1c8135b3c8ca08d1b76a93e..63487642fa3be8b51315d47c80717636194050eb
@@@ -1,28 -1,28 +1,57 @@@
  -----BEGIN PRIVATE KEY-----
++<<<<<<< HEAD
 +MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDBeZmEwzWdCeMb
 +slIAKdRhID+TdVJR8IX6G4CeKMVPlx/A29jtekpR2EMa1mi+vNuDzDU8yfhDGDNY
 +WKcUnMGUdfp5P8y7678I4UG6Ir6RFZLP8jq+Fu+tMbELh+5EyFY5bK3tW2GEftBn
 +XwWMXZIXLEDlNdOaJGgMMRpbcdnolD7sG30+fR8h4/4gLnNyd2CPKFUhp9c8YD/H
 +rJ007Afnv/NtlQ2vQQsdVgBUAeGqnm02JdcDKhlXnVq+VzIFRA977XTiHQM+Nijc
 +EOyqO1Fwagr+RQ1RoEdTB9VnbW9STCPLMTNSJw25jxJr5149AHbLcwZEl6Et3xkU
 +PFKutnjfAgMBAAECgf8FSk3oU24j3SFYoIedeYdVIIyce5jEpM8FB7t8l6DNjFRR
 +8bD8zVs64a70DOjQTlmyQOMzxlIDg6XjxIjNB3xDkvZGWng+qzOOCprBfDG5xd09
 +0mHI0Ne85J7yscTSHKg+6bnXw6fm95C7Qt3j+KsF9y/PFKm0jUpLCwytc2+B7H+g
 +Jdx7Z8gOvgQYuyehBkwCBiFYOucsUR9FZf6uzEnS+4KJIkJBtFQUrDDv9W7R8p7N
 +glV8G0oIOFI6CtB6B4SKoCdyrW2WLLh674phanX7kOFyL03DXoI8Lwmwi3mQ5m+z
 +wWtW3xD3S2fL9qvgsqyp5QUxeS/QlZkVjCyZroECgYEA4BptlI+YmYFSQE0yzGwK
 +kEmh/SzpsEM4qZoiLlS0XEbQZY+i6JeORssYEe7LQqPCABVTY3mkbsiXaxngVG6r
 +l4HeU7jzDzOFr7uh8cLLDS6BRnxy2G8eRg47JRi8tgAKd+EdhYtq4H9ntg9eb4wn
 +VxM36AF/SLRBXiG7AHi/dUECgYEA3QMuY+5ImURF6EnydUkBzxU4JeeQhfEcydFc
 +IsM4uXJ1n31CzatUOeR9ITspFNRemtLyBguygOodlil1XOV0GfTRHnh3oT3JzuPb
 +71a/Na6kn39tpIDBNFAL2YKGIvtmKCwzzuCtV78+WQXlhsfpgDW0ZDEKcoH8WVrl
 +lfIXxh8CgYAYshDdTC2uzNd5iohMiqNnXxXgxnBCIkY+OmQF4wO1H4CbkIaNRxZA
 +quTOJRh1EYKxa6gy0BbUtnopLULRSxjRq1gKtdjjFfRndy/Tannhy/wm/lPRkf0u
 +DydpYR56l+qPZ1lPfBuc/a06HNt1Q2aaa92/TVrvch2599GZrbS7gQKBgQCYIDZw
 +RnXmOV49E5k2Lbh3B84MGSYba+k66UaYDvQegbCAxUGUO5fP+Xw/wW73jW5I92Xr
 +z2Vg4sTWtVa5SJ7vttmyNY1yiQs9ww2B4p3en4Vk29tmXdGe5nIhl3wo3A5nHHXU
 +skXenh6WPD7O1Q/eVhkC1daxFtPR1YUt/uNqVQKBgHQG/ese8lJgzs5ZYzm185b4
 +EgUxhKcVmyldAcESFFfDW8RevLGkVpof+yueK2qSUkG7mfKWcElqhC+0IAsgSTwG
 +fsQv7rEVd/HXIMuFIuYTSJoaiU0cD3UjEJOB/eKRcwthMgxVjLFq6z2MwEYQeQ4g
 +hVgUxUwW0aRbm+ygOuNS
++=======
+ MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNDnAaqIhAWc15
+ 2Pzk4glOO2O0KZXtAI4XctbH4eUy7cCClBMj8FJkrNMlmsD4gDARru5erweWCmvm
+ mPAeWrvCdlIe4Knau6rd1ZV4PJwWGUWb9fnFt7Ems6FFQcCPpvXtl/LChNEgWvrG
+ Eqs29JICchtj1cjnnzsiXpJtJZNF2MBg94iYjOgMwBvADOq/fCB/oH2z+jmBudr/
+ KdnpDgG0LlCgBdINmsLTb06zuYBTkNH6Ap/uAorNRl5Vro9cMng4JXbP2KjlcLoV
+ IZ6zY0TeRkAGvRlCdDnBRQaZO9fbbogkLSAB5EpE+JfWHWouSzexKXpOolCyRPEZ
+ 1z11dLuHAgMBAAECggEAdGgB0+BgmMdiEg3QYs6+oZ6tVxVUexqZj04uB4KBbovx
+ gS82PmyrGWPS6cIUUf3TS/aWc0HBeLep0Vp41YKEnDw3GjhHtFhdA1nAZGVj5leq
+ YIMeq9M/ycynfH17JxGNArgDo9FqNofvXIo0kBn+2UyVp/Mw/ewy0awGS9fM5xTE
+ qvhzau2a9qlaRUZ4oCqMIPQNqc1KrKGAzs7VavCLVdV0PbyIoYG3nAhDriglVRiT
+ 63iCRgUyIG5CEV0EEGLljtfrC7wYDsA4tD4JOy0kyPE2Myc/qCgsBf1IQkuo3qjh
+ mP0BFNIvmt7eDm7S5DrZssabq7D7FVVQCuQ8cyFqQQKBgQDuXNx7R10576kIY7GV
+ lJL3vT+CvcxZriHG4lKXgphUKUBmm+nYX7KO3tf0kBdkoVPVg8Vn+YVnnp6NyxLd
+ G3g9nKx5XYVGtkDBypaJSf9TYEtJGZhEgu/mbUzmZei4kMLSLRcKow69OnVJp44M
+ +LFloD0oXuy4HQpBtoGkJEHWWQKBgQDcOq2LoPGLres5Pj2Q9X4W0S95a9nlQ1cH
+ lk5vuE1lDkusgXKozMzdMCBXNHqkdD2/9sXc43SFfIurAFyhEXndWCOR/t5ohdSt
+ Qf31VoUqO2nrXSD1VyzFSiln2SEd9F8HAqDfVBPOn5DCGotIDMxlcg2NWD2gr8Jz
+ fpvRI9qk3wKBgFKXMn40uAS/Gd6iTIH7vQDCPiNbCFd6kpGLEfsVcRqYQIxNMbWb
+ Uw9V/5Xp53EixR2STvA78RF6UI3o81xRjFQs2UYkNW3O8Jk1TPu8/A8zqmJlz/DN
+ Pbql3KNoZD6vShHxNa6l2RGQE9u1hu7PrQf9gbNfUL5qsYcbacgqF/XhAoGAfVXf
+ wuF71pTKlC959m/grLesnxvkTHhApY7DYQ2w7lxucOTTDoJP7WogXcD+M238Xq3g
+ +c9xVy8EhfOUxA4gHvq0c7hrd20DFv/BusjczKY3p72+riJI1pdYbUPDdzrGgkTa
+ rX86LpPdXLqingS6ptl8IP8hQ7wDnJtnrmULYF0CgYEAhjrbYzaScKJiOr6Sz5zo
+ bLrzdLjJrIggeuK1kmIWk9pIumRvmjkskJbzj5UUaA6lCxDTVS0c7NF5GRXYFcm4
+ 0B9W2UMTRBxw9HjC/gl/4oVSorwrHe0RbQVSbzLMJoGfHFfa4y7hkM4Ro6w2KGqg
+ IA/Nc/RX4C6cR1bdwS7KNBY=
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
  -----END PRIVATE KEY-----
index ecbff87350163793813c8a79d7ab33d900fbe63a,8c886e79550210ad8b8ac9a788352bb96580624c..0343bbc602a420b512155cf2c305d2b5a480d781
@@@ -1,16 -1,16 +1,29 @@@
++<<<<<<< HEAD
 +# Generated by LVM2 version 2.02.176(2) (2017-11-03): Mon May  2 00:08:12 2022
++=======
+ # Generated by LVM2 version 2.02.176(2) (2017-11-03): Thu Apr 28 11:09:37 2022
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
  
  contents = "Text Format Volume Group"
  version = 1
  
- description = "Created *after* executing '/sbin/lvremove -y /dev/system/var_backup'"
+ description = "Created *after* executing 'pvscan --cache --activate ay 253:0'"
  
++<<<<<<< HEAD
 +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 = 1651442892    # Mon May  2 00:08:12 2022
 +
 +system {
 +      id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv"
 +      seqno = 1355
++=======
+ creation_host = "homeserver"  # Linux homeserver 5.0.0-32-generic #34~18.04.2-Ubuntu SMP Thu Oct 10 10:36:02 UTC 2019 x86_64
+ creation_time = 1651136977    # Thu Apr 28 11:09:37 2022
+ system {
+       id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv"
+       seqno = 1307
++>>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
        format = "lvm2"                 # informational
        status = ["RESIZEABLE", "READ", "WRITE"]
        flags = []