/!\ Big Merge REBASING
This commit is contained in:
@@ -13,6 +13,7 @@ LOG_CONN_DIR=/var/log/tcpd
|
||||
LOG_CONN=$LOG_CONN_DIR/lasts.log
|
||||
NET_STATUS=/tmp/status.txt
|
||||
SSH=177
|
||||
IAMUTOPIST=128.65.199.189
|
||||
|
||||
JOURNAL_DIR=$HOME/journal
|
||||
PERSO_DIR=$HOME/perso
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
#%PAM-1.0
|
||||
|
||||
auth requisite pam_nologin.so
|
||||
auth include system-local-login
|
||||
auth optional pam_gnome_keyring.so
|
||||
|
||||
account include system-local-login
|
||||
|
||||
session include system-local-login
|
||||
session optional pam_gnome_keyring.so auto_start
|
||||
|
||||
password include system-local-login
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#%PAM-1.0
|
||||
auth required pam_unix.so try_first_pass
|
||||
account required pam_unix.so
|
||||
password required pam_unix.so
|
||||
session required pam_unix.so
|
||||
|
||||
@@ -3,3 +3,5 @@ nameserver 0.0.0.0
|
||||
nameserver 8.26.56.26
|
||||
nameserver 208.67.222.222
|
||||
nameserver 209.244.0.3
|
||||
nameserver 8.8.8.8
|
||||
|
||||
|
||||
Regular → Executable
+3
@@ -1,3 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
# This file is part of systemd. -> systemctl enable --now systemd-resolved
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it under the
|
||||
@@ -42,3 +43,5 @@ ReadEtcHosts=yes
|
||||
#ResolveUnicastSingleLabel=no
|
||||
#StaleRetentionSec=0
|
||||
#RefuseRecordTypes=
|
||||
=======
|
||||
>>>>>>> d378d2f ( /!\ Big Merge REBASING)
|
||||
|
||||
Reference in New Issue
Block a user