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

diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
index c2780143c0e3ecbf7519ca35a216114e24be4816..975388a794196ccc407447b881f358451bccd976 100644 (file)
--- a/.idea/dictionaries/project.xml
+++ b/.idea/dictionaries/project.xml
@@ -6,11 +6,14 @@
       <w>genkey</w>
       <w>ifconfig</w>
       <w>inkey</w>
+      <w>nobind</w>
       <w>nopass</w>
       <w>ovpn</w>
       <w>passout</w>
+      <w>phasecustomsoft</w>
       <w>phsdb</w>
       <w>pkitool</w>
+      <w>resolv</w>
     </words>
   </dictionary>
 </component>
\ No newline at end of file

diff --git a/src/controllers/vpn.controller.js b/src/controllers/vpn.controller.js
index 4a4b9bc9fe748654dc43c7777c9389bf72558ae6..e976ed8f87504eecbdb1db9d3b4ed0e7d6652220 100644 (file)
--- a/src/controllers/vpn.controller.js
+++ b/src/controllers/vpn.controller.js
@@ -60,8 +60,9 @@ module.exports = {
         `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',
-        `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`,
+        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`,