commit 2495cd4788cf44d3c0a7ea1ddfeb206c8f04014c
author Jeremy Mowery <jermowery@email.arizona.edu> Mon Jan 11 12:32:41 2016 -0700
committer Jeremy Mowery <jermowery@email.arizona.edu> Mon Jan 11 12:32:41 2016 -0700
tree 6b368730ca8bbc9033a1da5dadc71ad0576fc177
parent d51b6d2b1d899ef0178f5f2ed5e11b1a70706977

Attempt to fix file naming

xos/observers/vpn/steps/sync_vpntenant.py

diff --git a/xos/observers/vpn/steps/sync_vpntenant.py b/xos/observers/vpn/steps/sync_vpntenant.py
index 31500d3..17d2f45 100644
--- a/xos/observers/vpn/steps/sync_vpntenant.py
+++ b/xos/observers/vpn/steps/sync_vpntenant.py
@@ -37,7 +37,7 @@
                 "client_address": o.client_address}
 
     def create_client_script(self, tenant):
-        script = open("/opt/xos/core/" + tenant.file_name, 'w')
+        script = open("/opt/xos/core/static/vpn/" + str(tenant.file_name), 'w')
         # write the key portion
         script.write("printf \"")
         for line in tenant.server_key.splitlines():

xos/services/vpn/admin.py

diff --git a/xos/services/vpn/admin.py b/xos/services/vpn/admin.py
index 2c6250a..3c63026 100644
--- a/xos/services/vpn/admin.py
+++ b/xos/services/vpn/admin.py
@@ -94,7 +94,7 @@
             self.fields['client_address'].initial = "10.8.0.2"
             self.fields['is_persistent'].initial = True
             self.fields['can_view_subnet'].initial = False
-            self.fields['file_name'].initial = "/static/vpn/" + str(time.time()) + ".vpn"
+            self.fields['file_name'].initial = str(time.time()) + ".vpn"
             if VPNService.get_service_objects().exists():
                 self.fields["provider_service"].initial = VPNService.get_service_objects().all()[
                     0]