diff --git a/client/server_scripts/dns/run_container.sh b/client/server_scripts/dns/run_container.sh index a04ef9a4..510be1f9 100644 --- a/client/server_scripts/dns/run_container.sh +++ b/client/server_scripts/dns/run_container.sh @@ -1,2 +1,2 @@ # Run container -sudo docker run -d --restart always --cap-add=NET_ADMIN -p 53:53/udp -p 53:53/tcp --name $CONTAINER_NAME $CONTAINER_NAME +sudo docker run -d --restart always --network amnezia-dns-net --ip=172.29.172.254 -p 53:53/udp -p 53:53/tcp --name $CONTAINER_NAME $CONTAINER_NAME diff --git a/client/server_scripts/openvpn/run_container.sh b/client/server_scripts/openvpn/run_container.sh index b3216482..d57b595b 100644 --- a/client/server_scripts/openvpn/run_container.sh +++ b/client/server_scripts/openvpn/run_container.sh @@ -1,5 +1,6 @@ # Run container sudo docker run -d --restart always --cap-add=NET_ADMIN -p $OPENVPN_PORT:$OPENVPN_PORT/$OPENVPN_TRANSPORT_PROTO --name $CONTAINER_NAME $CONTAINER_NAME +sudo docker network connect amnezia-dns-net $CONTAINER_NAME # Create tun device if not exist sudo docker exec -i $CONTAINER_NAME bash -c 'mkdir -p /dev/net; if [ ! -c /dev/net/tun ]; then mknod /dev/net/tun c 10 200; fi' diff --git a/client/server_scripts/openvpn/start.sh b/client/server_scripts/openvpn/start.sh index f9783557..4a56b5de 100644 --- a/client/server_scripts/openvpn/start.sh +++ b/client/server_scripts/openvpn/start.sh @@ -14,9 +14,12 @@ iptables -A OUTPUT -o tun0 -j ACCEPT # Allow forwarding traffic only from the VPN. iptables -A FORWARD -i tun0 -o eth0 -s $OPENVPN_SUBNET_IP/$OPENVPN_SUBNET_CIDR -j ACCEPT +iptables -A FORWARD -i tun0 -o eth1 -s $OPENVPN_SUBNET_IP/$OPENVPN_SUBNET_CIDR -j ACCEPT + iptables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT iptables -t nat -A POSTROUTING -s $OPENVPN_SUBNET_IP/$OPENVPN_SUBNET_CIDR -o eth0 -j MASQUERADE +iptables -t nat -A POSTROUTING -s $OPENVPN_SUBNET_IP/$OPENVPN_SUBNET_CIDR -o eth1 -j MASQUERADE # kill daemons in case of restart killall -KILL openvpn diff --git a/client/server_scripts/prepare_host.sh b/client/server_scripts/prepare_host.sh index 94f7d727..bbcc5959 100644 --- a/client/server_scripts/prepare_host.sh +++ b/client/server_scripts/prepare_host.sh @@ -1,3 +1,4 @@ CUR_USER=$(whoami);\ sudo mkdir -p $DOCKERFILE_FOLDER;\ sudo chown $CUR_USER $DOCKERFILE_FOLDER +if ! docker network ls | grep -q amnezia-dns-net; then docker network create --driver bridge --subnet=172.29.172.0/24 --opt com.docker.network.bridge.name=amn0 amnezia-dns-net; fi