rebasing .git

usr/etc/env

@@ -22,3 +22,5 @@ BIN=$MACHINE_DIR/usr/bin
 SBIN_DIR=$MACHINE_DIR/usr/sbin
 BIN_DIR=$BIN
 PY_ENV=$BIN/py-env
+
+VPS=83.228.219.61

usr/etc/openvpn/.pot.swp

@@ -0,0 +1,2 @@
+Gtd5u0nRC3vf1oRt
+RUWJhKHulxLjfg8jDqvDncC5DMq6lZRE

usr/etc/pam.d/login

@@ -0,0 +1,13 @@
+#%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
+

usr/etc/resolv.conf

@@ -1,4 +1,5 @@
 nameserver 1.1.1.1
+nameserver 0.0.0.0
 nameserver 8.26.56.26
 nameserver 208.67.222.222
 nameserver 209.244.0.3

usr/etc/systemd/resolved.conf

@@ -18,9 +18,9 @@
 
 [Resolve]
 # Some examples of DNS servers which may be used for DNS= and FallbackDNS=:
-DNS=1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001 #cloudflare-dns.com
+DNS=1.1.1.1  2606:4700:4700::1111 2606:4700:4700::1001
 # Quad9:      9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
-FallbackDNS=193.110.81.0 185.253.5.0 2a0f:fc80:: 2a0f:fc81:: #dns0.eu
+FallbackDNS=185.253.5.0 2a0f:fc80:: 2a0f:fc81::
 #
 # Using DNS= configures global DNS servers and does not suppress link-specific
 # configuration. Parallel requests will be sent to per-link DNS servers
@@ -30,7 +30,7 @@ FallbackDNS=193.110.81.0 185.253.5.0 2a0f:fc80:: 2a0f:fc81:: #dns0.eu
 #DNS=
 #FallbackDNS=9.9.9.9#dns.quad9.net 2620:fe::9#dns.quad9.net 1.1.1.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 8.8.8.8#dns.google 2001:4860:4860::8888#dns.google
 #Domains=
-DNSSEC=yes
+DNSSEC=allow-downgrade
 DNSOverTLS=yes
 MulticastDNS=yes
 LLMNR=yes

usr/etc/systemd/system/tcpd.service

@@ -4,7 +4,6 @@ After=network-online.target
 
 [Service]
 ExecStart=/bin/bash /etc/systemd/system/tcpd.sh
-After=tcpd-bkup.service
 Type=simple
 
 [Install]

usr/etc/systemd/system/tcpd_bkup.service.legacy

@@ -0,0 +1,11 @@
+[Unit]
+Description=backups tcpd log file, keeping ip adresses only
+
+[Service]
+ExecStart=/bin/bash /etc/systemd/system/tcpd_bkup.sh
+Restart=on-failure
+RestartSec=121s
+Type=oneshot
+
+[Install]
+WantedBy=multi-user.target

usr/etc/systemd/system/tcpd_bkup.sh

@@ -1,21 +1,22 @@
-#!/usr/bin/bash
+#!/bin/bash
 #run from crontab
 
+
 . /home/.bashrc
 
+[ -f "$LOG_CONN" ] || exit 0
+
 . refresh_time
 
-STATUS=ronron
+STATUS=network.conns
 if [ -f $NET_STATUS ] ; then
 	STATUS=$(cat $NET_STATUS)
 fi
 
-DIR=$LOG_CONN_DIR/$STATUS
+DIR="$LOG_CONN_DIR/$STATUS"
 mkdir -p $DIR
-grepip $LOG_CONN > $DIR/${DATE}_${TIME}.conn
-mv -f $LOG_CONN $LOG_CONN_DIR/prev.log
+grepip "$LOG_CONN"  > "$DIR/${DATE}_${TIME}.conn"
+mv -f "$LOG_CONN" "$LOG_CONN_DIR/prev.log"
+
 systemctl restart tcpd
 
-exit 0
-
-

usr/etc/systemd/system/tcpd_bkup.timer.legacy

@@ -0,0 +1,10 @@
+[Unit]
+Description=Run tcpd_bkup.service every 2 minutes
+
+[Timer]
+OnBootSec=2min
+OnUnitActiveSec=2min
+Persistent=true
+
+[Install]
+WantedBy=timers.target