commit 0e6f7057d71843d100da5dab2db4a9e22d68e180
author Jeremy Mowery <jermowery@email.arizona.edu> Tue Jan 05 00:04:50 2016 -0500
committer Jeremy Mowery <jermowery@email.arizona.edu> Tue Jan 05 00:04:50 2016 -0500
tree 6973bef3992a667662db68c777650b65d57ed20d
parent 5c4d5dbc1eb79778a135d57ad3b8226fb5d02164
parent ae2177ebf209c6647003a595e93b9be5d7e1de45

Merge AddVPNService

xos/services/vpn/__init__.py

diff --git a/xos/vpn/__init__.py b/xos/services/vpn/__init__.py
similarity index 100%
rename from xos/vpn/__init__.py
rename to xos/services/vpn/__init__.py

xos/services/vpn/admin.py

diff --git a/xos/vpn/admin.py b/xos/services/vpn/admin.py
similarity index 100%
rename from xos/vpn/admin.py
rename to xos/services/vpn/admin.py

xos/services/vpn/models.py

diff --git a/xos/vpn/models.py b/xos/services/vpn/models.py
similarity index 100%
rename from xos/vpn/models.py
rename to xos/services/vpn/models.py

xos/services/vpn/templates/vpnserviceadmin.html

diff --git a/xos/vpn/templates/vpnserviceadmin.html b/xos/services/vpn/templates/vpnserviceadmin.html
similarity index 100%
rename from xos/vpn/templates/vpnserviceadmin.html
rename to xos/services/vpn/templates/vpnserviceadmin.html

xos/xos/settings.py

diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index b6ad0b3..5c1e88e 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -173,7 +173,6 @@
     'rest_framework',
     'django_extensions',
     'core',
-    'services.vpn',
     'services.hpc',
     'services.cord',
     'services.helloworldservice_complete',
@@ -181,6 +180,7 @@
     'services.ceilometer',
     'services.requestrouter',
     'services.syndicate_storage',
+    'services.vpn',
     'geoposition',
     'rest_framework_swagger',
 )