From 8b8c60b5d6bc9e662710a6e937f073a2d59fbd94 Mon Sep 17 00:00:00 2001
From: flameshikari <mail@hexed.pw>
Date: Mon, 19 Aug 2024 23:42:31 +0500
Subject: [PATCH] fix logging; link scripts to /usr/bin

---
 Dockerfile                                          | 1 +
 rootfs/etc/systemd/system/antizapret-update.service | 2 +-
 rootfs/etc/systemd/system/dnsmap.service            | 2 +-
 rootfs/init.sh                                      | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea05a66..9dbb23e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -104,6 +104,7 @@ RUN <<-"EOF" bash -ex
     for list in antizapret/config/*-custom.txt; do rm -f $list; done
 
     ln -sf /root/antizapret/doall.sh /usr/bin/doall
+    ln -sf /root/antizapret/dnsmap.py /usr/bin/dnsmap
 
     rm -frv /tmp/*
 EOF
diff --git a/rootfs/etc/systemd/system/antizapret-update.service b/rootfs/etc/systemd/system/antizapret-update.service
index a12f7b1..45920b4 100644
--- a/rootfs/etc/systemd/system/antizapret-update.service
+++ b/rootfs/etc/systemd/system/antizapret-update.service
@@ -5,7 +5,7 @@ Wants=network-online.target
 
 [Service]
 WorkingDirectory=/root/antizapret
-ExecStart=/root/antizapret/doall.sh
+ExecStart=/usr/bin/doall
 EnvironmentFile=/etc/default/antizapret
 
 [Install]
diff --git a/rootfs/etc/systemd/system/dnsmap.service b/rootfs/etc/systemd/system/dnsmap.service
index 20d180d..b30160e 100644
--- a/rootfs/etc/systemd/system/dnsmap.service
+++ b/rootfs/etc/systemd/system/dnsmap.service
@@ -3,7 +3,7 @@ Description=dnsmap
 After=network.target
 
 [Service]
-ExecStart=/root/antizapret/dnsmap.py -a 127.0.0.4 --iprange 10.224.0.0/15
+ExecStart=/usr/bin/dnsmap -a 127.0.0.4 --iprange 10.224.0.0/15
 EnvironmentFile=/etc/default/antizapret
 
 [Install]
diff --git a/rootfs/init.sh b/rootfs/init.sh
index cbaeef9..7dca726 100755
--- a/rootfs/init.sh
+++ b/rootfs/init.sh
@@ -32,10 +32,11 @@ function set_ciphers () {
 # save DNS variables to /etc/default/antizapret
 # in order to systemd services can access them
 
-cat << EOF | tee /etc/default/antizapret
+cat << EOF | sponge /etc/default/antizapret
 DCO=${DCO:-1}
 DNS=$(resolve $DNS)
 DNS_RU=$(resolve $DNS_RU 77.88.8.8)
+PYTHONUNBUFFERED=1
 EOF
 
 
@@ -57,12 +58,11 @@ done
 
 
 # swap between legacy ciphers and DCO-required ciphers
-
 [[ $DCO == 0 ]] && set_ciphers AES-128-CBC:AES-256-CBC || set_ciphers
 
 
-# output systemd logs to docker logs
-postrun journalctl -f --no-hostname --since "$(date '+%Y-%m-%d %T')"
+# output systemd logs to docker logs since container boot
+postrun 'journalctl --boot --follow --lines=all --no-hostname'
 
 
 # systemd init