Cleaning up the revoke client function and starting on the create client function...

diff --git a/src/controllers/vpn.controller.js b/src/controllers/vpn.controller.js
index e976ed8f87504eecbdb1db9d3b4ed0e7d6652220..0e9c191b172ad644d1418ec894d255dda5067977 100644 (file)
--- a/src/controllers/vpn.controller.js
+++ b/src/controllers/vpn.controller.js
@@ -59,18 +59,16 @@ module.exports = {
       const commands = [
         `cd /etc/openvpn/easy-rsa`,
         `sudo ./easyrsa --batch build-client-full ${clientName} nopass`,
-        `sudo mkdir -p /etc/openvpn/client-configs`,
-        staticIp ? `echo "ifconfig-push ${staticIp} 255.255.255.0" | sudo tee /etc/openvpn/ccd/${clientName}` : 'true',
-        `echo "client\ndev tun\nproto tcp\nremote phasecustomsoft.com 1194\nresolv-retry infinite\nnobind\npersist-key\npersist-tun\nremote-cert-tls server\ncipher AES-256-GCM\nauth SHA256\ncompress lz4-v2\nverb 3\n" | sudo tee /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "<ca>" | sudo tee /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `sudo cat pki/ca.crt | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "</ca>\n<cert>" | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `sudo cat pki/issued/${clientName}.crt | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "</cert>\n<key>" | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `sudo cat pki/private/${clientName}.key | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "</key>" | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `sudo cat /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `mv /etc/openvpn/client-configs/${clientName}.ovpn /home/charles/clients/${clientName}.ovpn`
+        `cp ../client-template.txt /etc/openvpn/clients/${ clientName }.ovpn`,
+        staticIp ? `echo "ifconfig-push ${staticIp} 255.255.255.0" | tee /etc/openvpn/ccd/${clientName}` : 'true',
+        `echo "<ca>" | sudo tee /etc/openvpn/clients/${clientName}.ovpn`,
+        `sudo cat pki/ca.crt | sudo tee -a /etc/openvpn/clients/${clientName}.ovpn`,
+        `echo "</ca>\n<cert>" | sudo tee -a /etc/openvpn/clients/${clientName}.ovpn`,
+        `sudo cat pki/issued/${clientName}.crt | sudo tee -a /etc/openvpn/clients/${clientName}.ovpn`,
+        `echo "</cert>\n<key>" | sudo tee -a /etc/openvpn/clients/${clientName}.ovpn`,
+        `sudo cat pki/private/${clientName}.key | sudo tee -a /etc/openvpn/clients/${clientName}.ovpn`,
+        `echo "</key>" | sudo tee -a /etc/openvpn/clients/${clientName}.ovpn`,
+        `cp /etc/openvpn/clients/${clientName}.ovpn /home/charles/clients/${clientName}.ovpn`
       ];
 
       console.log( commands );