commit 8a4e2585a92e392278c5377bf5e8d2f53243e947
author Jeremy Mowery <jermowery@email.arizona.edu> Sun Apr 10 12:18:59 2016 -0700
committer Jeremy Mowery <jermowery@email.arizona.edu> Sun Apr 10 12:18:59 2016 -0700
tree b8845e271dc9adb50bf3aca0d7d6fcd473971c58
parent 8a4b03ea8a64babfb1ba1a26de156eb7772cbd02

fix use_ca_from

xos/services/vpn/admin.py

diff --git a/xos/services/vpn/admin.py b/xos/services/vpn/admin.py
index f3d680f..e34953b 100644
--- a/xos/services/vpn/admin.py
+++ b/xos/services/vpn/admin.py
@@ -204,6 +204,9 @@
                 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")
@@ -211,6 +214,9 @@
             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")
 
         result.ca_crt = self.generate_ca_crt()