saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 5451d0874230d4d69afab2e7c4489f23b998e2cb..b6bb90230236ea72b84a68b1e6bc3243053e3660 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2410,6 +2410,7 @@ maybe chmod 0644 'timezone'
 maybe chmod 0755 'timidity'
 maybe chmod 0644 'timidity/freepats.cfg'
 maybe chmod 0755 'tmpfiles.d'
+maybe chmod 0600 'u2f_mappings'
 maybe chmod 0644 'ucf.conf'
 maybe chmod 0755 'udev'
 maybe chmod 0755 'udev/hwdb.d'

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 5ef334f807ce7e8cf0b5586c20d1b427e47c9228..57a9c5864d59b8054e78ac15dc15940bab8a3844 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -79,22 +79,3 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer TEST>
-UUID urn:uuid:cd1159fd-e594-3749-730d-ad2e215eb94f
-Info TEST @ linux-a5xv
-Location linux-a5xv.local
-DeviceURI ipps://linux-a5xv.local:631/printers/TEST
-State Idle
-StateTime 1532669702
-ConfigTime 1532669702
-Type 6
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Option cups-browsed true
-</Printer>

diff --git a/group b/group
index beb4bded6f4be74ea2085538d9a7af9d4c9e10dc..f6eef9770d9acd062d3294cac06e6007a00ca04d 100644 (file)
--- a/group
+++ b/group
@@ -76,3 +76,4 @@ wireshark:x:135:
 davfs2:x:136:mhoellein
 mongodb:x:137:mongodb
 trezord:x:999:
+u2fkey:x:1012:mhoellein

diff --git a/group- b/group-
index 7377974467054ddd745e69cd68d3e7c4bf623b2c..bba470580d0aca7c74a150af06f57ece39fd6584 100644 (file)
--- a/group-
+++ b/group-
@@ -32,7 +32,7 @@ shadow:x:42:
 utmp:x:43:
 video:x:44:
 sasl:x:45:
-plugdev:x:46:mhoellein
+plugdev:x:46:mhoellein,trezord
 staff:x:50:
 games:x:60:
 users:x:100:
@@ -76,3 +76,4 @@ wireshark:x:135:
 davfs2:x:136:mhoellein
 mongodb:x:137:mongodb
 trezord:x:999:
+u2fkey:x:1012:

diff --git a/gshadow b/gshadow
index a5ad7c808275b036e5df1da7ebfbd71b385411db..bb1c9ce9cae723ba278483d552d6319f3a478dcc 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -76,3 +76,4 @@ wireshark:!::
 davfs2:!::mhoellein
 mongodb:!::mongodb
 trezord:!::
+u2fkey:!::mhoellein

diff --git a/gshadow- b/gshadow-
index 9431a4abc15a7cc2bced10eaae1a1c2cfe4776c0..f86c24152d3a8cb1b624e91d1a97323dbf53f469 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -32,7 +32,7 @@ shadow:*::
 utmp:*::
 video:*::
 sasl:*::
-plugdev:*::mhoellein
+plugdev:*::mhoellein,trezord
 staff:*::
 games:*::
 users:*::
@@ -76,3 +76,4 @@ wireshark:!::
 davfs2:!::mhoellein
 mongodb:!::mongodb
 trezord:!::
+u2fkey:!::

diff --git a/pam.d/gdm-autologin b/pam.d/gdm-autologin
index 1aa337b081ddc16cd000ceda79c8ada0a96504d5..fe5446b572d5214f8a8a38d7fa59aee967c22139 100644 (file)
--- a/pam.d/gdm-autologin
+++ b/pam.d/gdm-autologin
@@ -1,5 +1,6 @@
 #%PAM-1.0
 auth    requisite       pam_nologin.so
+auth    required        pam_u2f.so
 auth   required        pam_succeed_if.so user != root quiet_success
 auth    required        pam_permit.so
 @include common-account

diff --git a/pam.d/gdm-launch-environment b/pam.d/gdm-launch-environment
index aed9ae064eb9e452b9ed64b7ae19f62ad4f381aa..f22448c02354b8e8c596e6b0689302a5c6575341 100644 (file)
--- a/pam.d/gdm-launch-environment
+++ b/pam.d/gdm-launch-environment
@@ -1,5 +1,6 @@
 #%PAM-1.0
 auth    requisite       pam_nologin.so
+auth    required        pam_u2f.so
 auth    required        pam_permit.so
 @include common-account
 session optional        pam_keyinit.so force revoke

diff --git a/pam.d/gdm-password b/pam.d/gdm-password
index 7ed2b16eee2daa6d298a2c0fb762347bfb33eec3..b4a7a35b8cdcb2ff24f46d55e12a0b85a3d7b213 100644 (file)
--- a/pam.d/gdm-password
+++ b/pam.d/gdm-password
@@ -1,5 +1,6 @@
 #%PAM-1.0
 auth    requisite       pam_nologin.so
+auth    sufficient      pam_u2f.so
 auth   required        pam_succeed_if.so user != root quiet_success
 @include common-auth
 auth    optional        pam_gnome_keyring.so

diff --git a/pam.d/lightdm b/pam.d/lightdm
index 123ef3b1147bf6b855f110fbfd3836b54bdc51ee..361c8943f5b334fe6d28c1a4b5043ff6d433483a 100644 (file)
--- a/pam.d/lightdm
+++ b/pam.d/lightdm
@@ -1,5 +1,7 @@
 #%PAM-1.0
 auth    requisite       pam_nologin.so
+auth    sufficient      pam_u2f.so authfile=/etc/u2f_mappings cue
+#auth    required      pam_u2f.so
 auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
 @include common-auth
 auth    optional        pam_gnome_keyring.so

diff --git a/pam.d/login b/pam.d/login
index 434d7a252353bb105f26566af10a9e947c0d92fa..7b336053908e56c101b7fe0d3dabc331ad4bca7e 100644 (file)
--- a/pam.d/login
+++ b/pam.d/login
@@ -111,3 +111,4 @@ session    required     pam_loginuid.so
 session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
 # When the module is present, "required" would be sufficient (When SELinux
 # is disabled, this returns success.)
+auth required pam_u2f.so authfile=/etc/u2f_mappings cue

diff --git a/u2f_mappings b/u2f_mappings
new file mode 100644 (file)
index 0000000..25703c1
--- /dev/null
+++ b/u2f_mappings
@@ -0,0 +1 @@
+mhoellein:yA-6x9vCkYuZd2ga6c_IHM3NIxOUkQpJuG50xJsb63fZ4UbsqdT359rsBEDRp-N0mHawOQ4IqnpLA7_t1_wsBw,0425119a50882bd644bcb9ccfda26a9b41be4053b730b28388174d8252791da69184623dd78dc6bcb48899e9f8295ec0d43c55067104df3ae8d2e5c25a53377935
\ No newline at end of file