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 5f6f8eb53445c50f1cf52b7979be65c79c1c3cc2..cdfd2b25af1498837725bb6ddadb86db83d32ad0 100644 (file)
--- a/src/controllers/vpn.controller.js
+++ b/src/controllers/vpn.controller.js
@@ -58,26 +58,24 @@ module.exports = {
     conn.on( 'ready', () => {
       const commands = [
         `cd /etc/openvpn/easy-rsa`,
-        `./easyrsa build-client-full ${ clientName } nopass --batch`,
-        `mkdir -p /etc/openvpn/client-configs`,
-        staticIp ? `echo "ifconfig-push ${ staticIp } 255.255.255.0" > /etc/openvpn/client-configs/${ clientName }.ccd` :
-          'true', `/usr/share/easy-rsa/pkitool ${ clientName }`,
-        `openssl pkcs12 -export -in pki/issued/${ clientName }.crt -inkey pki/private/${ clientName }.key -certfile pki/ca.crt -out /etc/openvpn/client-configs/${ clientName }.p12 -passout pass:`,
-        `openvpn --genkey --secret /etc/openvpn/client-configs/${ clientName }.tls-auth`,
-        `cat /etc/openvpn/client-template.txt | sed "s/CLIENT_NAME/${ clientName }/" > /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `echo "<ca>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `cat pki/ca.crt >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `echo "</ca>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `echo "<cert>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `cat pki/issued/${ clientName }.crt >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `echo "</cert>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `echo "<key>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `cat pki/private/${ clientName }.key >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `echo "</key>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `echo "<tls-auth>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `cat /etc/openvpn/client-configs/${ clientName }.tls-auth >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `echo "</tls-auth>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
-        `cat /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `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`,
       ];
 
       console.log( commands );