commit 0ed5f4fb11dbdee08f93c3d60b41cf40b79652d3
author Jeremy Mowery <jermowery@email.arizona.edu> Sun Apr 10 21:47:37 2016 -0700
committer Jeremy Mowery <jermowery@email.arizona.edu> Sun Apr 10 21:47:37 2016 -0700
tree bd5622dd276079798edee49d644771f7881d659d
parent e500c48f7a91e61b23d994d2958a04579c2f4df3

Fix yet another bug

xos/services/vpn/admin.py

diff --git a/xos/services/vpn/admin.py b/xos/services/vpn/admin.py
index 3fba955..5ee792d 100644
--- a/xos/services/vpn/admin.py
+++ b/xos/services/vpn/admin.py
@@ -201,17 +201,9 @@
         if (not os.path.isdir(self.instance.pki_dir)):
             VPNService.execute_easyrsa_command(
                 self.instance.pki_dir, "init-pki")
-            if (self.instance.use_ca_from[0]):
-                shutil.copy2(
-                    self.instance.use_ca_from[0].pki_dir + "/ca.crt",
-                    self.instance.pki_dir)
-                shutil.copy2(
-                    self.instance.use_ca_from[0].pki_dir + "/private/ca.key",
-                    self.instance.pki_dir + "/private")
-            else:
-                VPNService.execute_easyrsa_command(
-                    self.instance.pki_dir, "--req-cn=XOS build-ca nopass")
-        elif (self.instance.use_ca_from[0]):
+            VPNService.execute_easyrsa_command(
+                self.instance.pki_dir, "--req-cn=XOS build-ca nopass")
+        if (self.instance.use_ca_from[0]):
             shutil.copy2(
                 self.instance.use_ca_from[0].pki_dir + "/ca.crt",
                 self.instance.pki_dir)