diff --git a/client/resources.qrc b/client/resources.qrc index fbc02a5a..fd24e397 100644 --- a/client/resources.qrc +++ b/client/resources.qrc @@ -33,7 +33,6 @@ images/line.png images/server_settings.png images/share.png - server_scripts/prepare_openvpn_client.sh server_scripts/remove_openvpn_server.sh server_scripts/setup_openvpn_server.sh server_scripts/template.ovpn diff --git a/client/server_scripts/prepare_openvpn_client.sh b/client/server_scripts/prepare_openvpn_client.sh deleted file mode 100644 index f72b7486..00000000 --- a/client/server_scripts/prepare_openvpn_client.sh +++ /dev/null @@ -1,24 +0,0 @@ -DOCKER_IMAGE="amneziavpn/openvpn:latest" -CONTAINER_NAME="amneziavpn" - -#sudo apt update -sudo apt install -y docker.io curl -sudo systemctl start docker - -sudo docker stop amneziavpn -sudo docker rm -f amneziavpn -sudo docker pull amneziavpn/openvpn:latest -sudo docker run -d --restart always --cap-add=NET_ADMIN -p 1194:1194/udp --name amneziavpn amneziavpn/openvpn:latest - - -docker exec -i amneziavpn sh -c "mkdir -p /opt/amneziavpn_data" -docker exec -i amneziavpn sh -c "cat /proc/sys/kernel/random/entropy_avail" -docker exec -i amneziavpn sh -c "cd /opt/amneziavpn_data && easyrsa init-pki && easyrsa gen-dh" - -docker exec -i amneziavpn sh -c "cd /opt/amneziavpn_data && cp pki/dh.pem /etc/openvpn && easyrsa build-ca nopass << EOF yes EOF && easyrsa gen-req MyReq nopass << EOF2 yes EOF2" -docker exec -i amneziavpn sh -c "cd /opt/amneziavpn_data && easyrsa sign-req server MyReq << EOF3 yes EOF3" -docker exec -i amneziavpn sh -c "openvpn --genkey --secret ta.key << EOF4 yes EOF4" -docker exec -i amneziavpn sh -c "cd /opt/amneziavpn_data && cp pki/ca.crt pki/issued/MyReq.crt pki/private/MyReq.key ta.key /etc/openvpn" -docker exec -i amneziavpn sh -c "openvpn --config /etc/openvpn/server.conf &" - -docker exec -i amneziavpn mkdir -p /opt/amneziavpn_data/clients diff --git a/client/server_scripts/setup_openvpn_server.sh b/client/server_scripts/setup_openvpn_server.sh index f72b7486..b5433fd4 100644 --- a/client/server_scripts/setup_openvpn_server.sh +++ b/client/server_scripts/setup_openvpn_server.sh @@ -11,14 +11,12 @@ sudo docker pull amneziavpn/openvpn:latest sudo docker run -d --restart always --cap-add=NET_ADMIN -p 1194:1194/udp --name amneziavpn amneziavpn/openvpn:latest -docker exec -i amneziavpn sh -c "mkdir -p /opt/amneziavpn_data" +docker exec -i amneziavpn sh -c "mkdir -p /opt/amneziavpn_data/clients" docker exec -i amneziavpn sh -c "cat /proc/sys/kernel/random/entropy_avail" docker exec -i amneziavpn sh -c "cd /opt/amneziavpn_data && easyrsa init-pki && easyrsa gen-dh" docker exec -i amneziavpn sh -c "cd /opt/amneziavpn_data && cp pki/dh.pem /etc/openvpn && easyrsa build-ca nopass << EOF yes EOF && easyrsa gen-req MyReq nopass << EOF2 yes EOF2" docker exec -i amneziavpn sh -c "cd /opt/amneziavpn_data && easyrsa sign-req server MyReq << EOF3 yes EOF3" -docker exec -i amneziavpn sh -c "openvpn --genkey --secret ta.key << EOF4 yes EOF4" +docker exec -i amneziavpn sh -c "openvpn --genkey --secret ta.key << EOF4" docker exec -i amneziavpn sh -c "cd /opt/amneziavpn_data && cp pki/ca.crt pki/issued/MyReq.crt pki/private/MyReq.key ta.key /etc/openvpn" docker exec -i amneziavpn sh -c "openvpn --config /etc/openvpn/server.conf &" - -docker exec -i amneziavpn mkdir -p /opt/amneziavpn_data/clients