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 cdfd2b25af1498837725bb6ddadb86db83d32ad0..06ceafebce1b575bff1dd6e2cb95bb2ed81d9cda 100644 (file)
--- a/src/controllers/vpn.controller.js
+++ b/src/controllers/vpn.controller.js
@@ -58,24 +58,20 @@ module.exports = {
     conn.on( 'ready', () => {
       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/client-configs/${clientName}.ccd` : 'true',
-        `sudo cp /etc/openvpn/client-template.txt /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `sed -i "s/CLIENT_NAME/${clientName}/" /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "<ca>" | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `sudo cat pki/ca.crt | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "</ca>" | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "<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>" | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "<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`,
-        `echo "<tls-auth>" | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `sudo cat /etc/openvpn/server/ta.key | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `echo "</tls-auth>" | sudo tee -a /etc/openvpn/client-configs/${clientName}.ovpn`,
-        `sudo cat /etc/openvpn/client-configs/${clientName}.ovpn`,
+        `./easyrsa --batch build-client-full ${clientName} nopass`,
+        staticIp ? `echo "ifconfig-push ${staticIp} 255.255.255.0" | tee /etc/openvpn/ccd/${clientName}` : 'true',
+        `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`,
       ];
 
       console.log( commands );