From ae71ef451344d99a8cdc3e6c215345f2c2be59cb Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 31 Dec 2019 18:06:40 +0100
Subject: [PATCH] Fix script

---
 debian9-x86_64.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 31436b4..bbf0582 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -478,17 +478,19 @@ if [ "$OPENVPN" = "yes" ]; then
 		if [ ! -d /etc/openvpn/ca ]; then
 			make-cadir /etc/openvpn/ca
 		fi
-		cp /etc/openvpn/server/ca.crt /etc/openvpn/ca/pki/ca.crt
-		cp /etc/openvpn/server/ca.key /etc/openvpn/ca/pki/private/ca.key
-		cp /etc/openvpn/server/server.crt /etc/openvpn/ca/pki/issued/server.crt
-		cp /etc/openvpn/server/server.key /etc/openvpn/ca/pki/private/server.key
-		cp /etc/openvpn/server/crl.pem /etc/openvpn/ca/pki/crl.pem
-		cp /etc/openvpn/client/client.crt /etc/openvpn/ca/pki/issued/openmptcprouter.crt
-		cp /etc/openvpn/client/client.key /etc/openvpn/ca/pki/private/openmptcprouter.key
+		mv /etc/openvpn/server/ca.crt /etc/openvpn/ca/pki/ca.crt
+		mv /etc/openvpn/server/ca.key /etc/openvpn/ca/pki/private/ca.key
+		mv /etc/openvpn/server/server.crt /etc/openvpn/ca/pki/issued/server.crt
+		mv /etc/openvpn/server/server.key /etc/openvpn/ca/pki/private/server.key
+		mv /etc/openvpn/server/crl.pem /etc/openvpn/ca/pki/crl.pem
+		mv /etc/openvpn/client/client.crt /etc/openvpn/ca/pki/issued/openmptcprouter.crt
+		mv /etc/openvpn/client/client.key /etc/openvpn/ca/pki/private/openmptcprouter.key
 	fi
-	if [ ! -f "/etc/openvpn/pki/issued/server.crt" ]; then
+	if [ ! -f "/etc/openvpn/ca/pki/issued/server.crt" ]; then
 		openssl dhparam -out /etc/openvpn/server/dh2048.pem 2048
-		make-cadir /etc/openvpn/ca
+		if [ ! -d /etc/openvpn/ca ]; then
+			make-cadir /etc/openvpn/ca
+		fi
 		cd /etc/openvpn/ca
 		./easyrsa init-pki
 		./easyrsa --batch build-ca nopass