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 7fdcda938ead0bb0e64079f7951b4fc0b6141300..daedf9fe3dac9ddc803184bf1f1f91e43989c971 100644 (file)
--- a/src/controllers/vpn.controller.js
+++ b/src/controllers/vpn.controller.js
@@ -62,7 +62,8 @@ module.exports = {
         `sudo ./easyrsa --batch build-client-full ${clientName} nopass`,
         staticIp ? `echo "ifconfig-push ${staticIp} 255.255.255.0" | tee -a /etc/openvpn/ccd/${clientName}` : 'true',
         `touch /etc/openvpn/clients/${ clientName }.ovpn`,
-        `echo "<ca>" | tee /etc/openvpn/clients/${clientName}.ovpn`,
+        `echo cat /etc/openvpn/client-template.txt | tee /etc/openvpn/clients/${clientName}.ovpn`,
+        `echo "<ca>" | tee -a /etc/openvpn/clients/${clientName}.ovpn`,
         `sudo cat pki/ca.crt | tee -a /etc/openvpn/clients/${clientName}.ovpn`,
         `echo "</ca>\n<cert>" | tee -a /etc/openvpn/clients/${clientName}.ovpn`,
         `sudo cat pki/issued/${clientName}.crt | tee -a /etc/openvpn/clients/${clientName}.ovpn`,