From 7efb681b022efd3e7000a633e974350856b1a357 Mon Sep 17 00:00:00 2001
From: lunardunno <126363523+lunardunno@users.noreply.github.com>
Date: Wed, 19 Mar 2025 11:00:08 +0400
Subject: [PATCH] using system directory

using the system directory to run services
---
 client/server_scripts/awg/run_container.sh     | 5 +++--
 client/server_scripts/remove_all_containers.sh | 2 ++
 client/server_scripts/remove_container.sh      | 3 ++-
 client/server_scripts/xray/run_container.sh    | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/server_scripts/awg/run_container.sh b/client/server_scripts/awg/run_container.sh
index a222e39c..4d067126 100644
--- a/client/server_scripts/awg/run_container.sh
+++ b/client/server_scripts/awg/run_container.sh
@@ -18,6 +18,7 @@ sudo docker network connect amnezia-dns-net $CONTAINER_NAME
 
 # Create service for podman
 if [ -n "$(sudo docker --version 2>/dev/null | grep podman)" ]; then \
-  sudo sh -c "podman generate systemd --restart-policy=always -t 1 --name $CONTAINER_NAME 2>/dev/null > $DOCKERFILE_FOLDER/container-$CONTAINER_NAME.service";\
-  sudo sh -c "systemctl enable --now $DOCKERFILE_FOLDER/container-$CONTAINER_NAME.service && docker update --restart no $CONTAINER_NAME > /dev/null";\
+  sudo sh -c "podman generate systemd --restart-policy=always -t 10 --name $CONTAINER_NAME 2>/dev/null > $DOCKERFILE_FOLDER/container-$CONTAINER_NAME.service";\
+  sudo cp $DOCKERFILE_FOLDER/container-$CONTAINER_NAME.service /etc/systemd/system/;\
+  sudo systemctl daemon-reload && sudo systemctl enable --now container-$CONTAINER_NAME.service && sudo docker update --restart no $CONTAINER_NAME > /dev/null;\
 fi
diff --git a/client/server_scripts/remove_all_containers.sh b/client/server_scripts/remove_all_containers.sh
index aed7cf9d..bbded5be 100644
--- a/client/server_scripts/remove_all_containers.sh
+++ b/client/server_scripts/remove_all_containers.sh
@@ -2,6 +2,8 @@ sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\
 sudo docker --version 2>/dev/null | grep -q podman && \
   sudo systemctl list-units | grep amnezia | awk '{print $1}' | xargs sudo systemctl disable --now && \
   sudo systemctl daemon-reload && sudo systemctl reset-failed && \
+  sudo rm -f /etc/systemd/system/container-amnezia-*.service && \
+  sudo systemctl daemon-reload && \
   sudo sed -i '/^  # Amnezia start/,/^  # Amnezia finish$/d' /var/cache/containers/short-name-aliases.conf;\
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\
 sudo docker images -a | grep amnezia | awk '{print $3}' | xargs sudo docker rmi;\
diff --git a/client/server_scripts/remove_container.sh b/client/server_scripts/remove_container.sh
index 3048b218..7619f76d 100644
--- a/client/server_scripts/remove_container.sh
+++ b/client/server_scripts/remove_container.sh
@@ -2,6 +2,7 @@ sudo docker stop $CONTAINER_NAME;\
 sudo docker --version 2>/dev/null | grep -q podman && \
   sudo systemctl disable --now container-$CONTAINER_NAME.service && \
   sudo systemctl daemon-reload && sudo systemctl reset-failed && \
-  sudo rm -f $DOCKERFILE_FOLDER/container-$CONTAINER_NAME.service;\
+  sudo rm -f /etc/systemd/system/container-$CONTAINER_NAME.service && \
+  sudo systemctl daemon-reload;\
 sudo docker rm -fv $CONTAINER_NAME;\
 sudo docker rmi $CONTAINER_NAME
diff --git a/client/server_scripts/xray/run_container.sh b/client/server_scripts/xray/run_container.sh
index 53702b3d..5014a817 100644
--- a/client/server_scripts/xray/run_container.sh
+++ b/client/server_scripts/xray/run_container.sh
@@ -18,6 +18,6 @@ sudo docker exec -i $CONTAINER_NAME bash -c 'mkdir -p /dev/net; if [ ! -c /dev/n
 # Create service for podman
 if [ -n "$(sudo docker --version 2>/dev/null | grep podman)" ]; then \
   sudo sh -c "podman generate systemd --new --name $CONTAINER_NAME 2>/dev/null > $DOCKERFILE_FOLDER/container-$CONTAINER_NAME.service";\
-  sudo mv $DOCKERFILE_FOLDER/container-$CONTAINER_NAME.service /etc/systemd/system/;\
-  sudo systemctl daemon-reload && sudo systemctl enable --now container-$CONTAINER_NAME.service;\
+  sudo cp $DOCKERFILE_FOLDER/container-$CONTAINER_NAME.service /etc/systemd/system/;\
+  sudo systemctl daemon-reload && sudo systemctl enable --now container-$CONTAINER_NAME.service && sudo docker update --restart no $CONTAINER_NAME > /dev/null;\
 fi