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 eab73dde1781c66006040a3344553ef0b91be1d4..4a4b9bc9fe748654dc43c7777c9389bf72558ae6 100644 (file)
--- a/src/controllers/vpn.controller.js
+++ b/src/controllers/vpn.controller.js
@@ -59,20 +59,17 @@ module.exports = {
       const commands = [
         `cd /etc/openvpn/easy-rsa`,
         `sudo ./easyrsa --batch build-client-full ${clientName} nopass`,
-        staticIp ? `echo "ifconfig-push ${staticIp} 255.255.255.0" | tee /etc/openvpn/ccd/${clientName}` : 'true',
-        `sudo /home/charles/clients/generate_ovpn.sh ${ clientName }`,
-        /*`cp /etc/openvpn/client-template.txt /home/charles/clients/${clientName}.ovpn`,
-        `sed -i "s/CLIENT_NAME/${clientName}/" /home/charles/clients/${clientName}.ovpn`,
-        `echo "<ca>" | tee -a /home/charles/clients/${clientName}.ovpn`,
-        `sudo cat pki/ca.crt | tee -a /home/charles/clients/${clientName}.ovpn`,
-        `echo "</ca>" | tee -a /home/charles/clients/${clientName}.ovpn`,
-        `echo "<cert>" | tee -a /home/charles/clients/${clientName}.ovpn`,
-        `sudo cat pki/issued/${clientName}.crt | tee -a /home/charles/clients/${clientName}.ovpn`,
-        `echo "</cert>" | sudo tee -a /home/charles/clients/${clientName}.ovpn`,
-        `echo "<key>" | tee -a /home/charles/clients/${clientName}.ovpn`,
-        `sudo cat pki/private/${clientName}.key | tee -a /home/charles/clients/${clientName}.ovpn`,
-        `echo "</key>" | tee -a /home/charles/clients/${clientName}.ovpn`,
-        `cat /home/charles/clients/${clientName}.ovpn`,*/
+        `sudo mkdir -p /etc/openvpn/client-configs`,
+        staticIp ? `echo "ifconfig-push ${staticIp} 255.255.255.0" | sudo tee /etc/openvpn/client-configs/${clientName}.ccd` : '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<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`
       ];
 
       console.log( commands );