diff --git a/install.sh b/install.sh
index 09b576c..95d4773 100755
--- a/install.sh
+++ b/install.sh
@@ -121,6 +121,7 @@ wget "https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.6/EasyRSA-unix-
tar -xaf "EasyRSA-unix-v3.0.6.tgz"
mv "EasyRSA-v3.0.6" /etc/openvpn/easy-rsa
rm "EasyRSA-unix-v3.0.6.tgz"
+
cd /etc/openvpn/easy-rsa
if [[ ! -z $key_size ]]; then
@@ -231,8 +232,14 @@ sed -i "s/\$user = '';/\$user = '$mysql_user';/" "./include/config.php"
sed -i "s/\$pass = '';/\$pass = '$mysql_pass';/" "./include/config.php"
# Replace in the client configurations with the ip of the server and openvpn protocol
-for file in "./client-conf/gnu-linux/client.conf" "./client-conf/osx-viscosity/client.conf" "./client-conf/windows/client.ovpn"; do
- sed -i "s/remote xxx\.xxx\.xxx\.xxx 443/remote $ip_server $server_port/" $file
+for file in $(find -name client.ovpn); do
+ sed -i "s/remote xxx\.xxx\.xxx\.xxx 443/remote $ip_server $server_port/" $file
+ echo "" >> $file
+ cat "/etc/openvpn/ca.crt" >> $file
+ echo "" >> $file
+ echo "" >> $file
+ cat "/etc/openvpn/ta.key" >> $file
+ echo ""
if [ $openvpn_proto = "udp" ]; then
sed -i "s/proto tcp-client/proto udp/" $file
diff --git a/installation/client-conf/gnu-linux/client.conf b/installation/client-conf/gnu-linux/client.ovpn
similarity index 93%
rename from installation/client-conf/gnu-linux/client.conf
rename to installation/client-conf/gnu-linux/client.ovpn
index 7aecb25..70c7c4d 100644
--- a/installation/client-conf/gnu-linux/client.conf
+++ b/installation/client-conf/gnu-linux/client.ovpn
@@ -8,8 +8,6 @@ redirect-gateway
# Keys
# Identity
-ca ca.crt
-tls-auth ta.key 1
key-direction 1
remote-cert-tls server
auth-user-pass
diff --git a/installation/client-conf/osx-viscosity/client.conf b/installation/client-conf/osx-viscosity/client.ovpn
similarity index 91%
rename from installation/client-conf/osx-viscosity/client.conf
rename to installation/client-conf/osx-viscosity/client.ovpn
index f6888e2..215392f 100644
--- a/installation/client-conf/osx-viscosity/client.conf
+++ b/installation/client-conf/osx-viscosity/client.ovpn
@@ -8,8 +8,6 @@ redirect-gateway
# Keys
# Identity
-ca ca.crt
-tls-auth ta.key 1
key-direction 1
remote-cert-tls server
auth-user-pass
diff --git a/installation/client-conf/windows/client.ovpn b/installation/client-conf/windows/client.ovpn
index f6888e2..215392f 100644
--- a/installation/client-conf/windows/client.ovpn
+++ b/installation/client-conf/windows/client.ovpn
@@ -8,8 +8,6 @@ redirect-gateway
# Keys
# Identity
-ca ca.crt
-tls-auth ta.key 1
key-direction 1
remote-cert-tls server
auth-user-pass