fixing dev/prod settings split
diff --git a/exp_portal/email.py b/exp_portal/email.py
index 6f03b4d..93d8347 100644
--- a/exp_portal/email.py
+++ b/exp_portal/email.py
@@ -3,7 +3,7 @@
from django.core import mail
from django.conf import settings
from tasks import user_authorized
-from xdata.settings import LOGIN_URL
+from base import LOGIN_URL
from django.contrib.auth.decorators import login_required
diff --git a/exp_portal/products.py b/exp_portal/products.py
index 1985241..b276082 100644
--- a/exp_portal/products.py
+++ b/exp_portal/products.py
@@ -3,7 +3,7 @@
from django.contrib.auth.decorators import login_required
from tasks import user_authorized
from django.contrib.auth.decorators import login_required
-from xdata.settings import LOGIN_URL
+from base import LOGIN_URL
@login_required(login_url=LOGIN_URL)
diff --git a/exp_portal/tasks.py b/exp_portal/tasks.py
index 2c27577..2bd214e 100644
--- a/exp_portal/tasks.py
+++ b/exp_portal/tasks.py
@@ -2,7 +2,7 @@
from op_tasks.models import UserProfile, Product, Dataset, OpTask, TaskListItem, Experiment
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
-from xdata.settings import LOGIN_URL
+from base import LOGIN_URL
def user_authorized(request):
user = request.user
diff --git a/manage.py b/manage.py
index 455ad10..c209905 100755
--- a/manage.py
+++ b/manage.py
@@ -3,7 +3,8 @@
import sys
if __name__ == "__main__":
- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xdata.settings")
+ sys.path.append('./xdata/settings')
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dev")
from django.core.management import execute_from_command_line
diff --git a/op_tasks/surveyMongoUpdate.sh b/op_tasks/surveyMongoUpdate.sh
index d95b28a..5e90cb5 100755
--- a/op_tasks/surveyMongoUpdate.sh
+++ b/op_tasks/surveyMongoUpdate.sh
@@ -4,7 +4,7 @@
startDir=`pwd`
lockfile=${startDir}/op_tasks/SM_LOCK
rootDIR='/home/ubuntu'
-venvPath=$rootDIR/sites/testing/venv
+venvPath=$rootDIR/sites/testing/virtualenv
smPath=${rootDIR}/smbitBucket/SurveyMongo
scotchPath="${rootDIR}/SCOtCH"
matDIR="${rootDIR}/smbitBucket/SurveyMongo/reports"
diff --git a/op_tasks/views.py b/op_tasks/views.py
index 8cf0341..33ec5c5 100755
--- a/op_tasks/views.py
+++ b/op_tasks/views.py
@@ -11,7 +11,7 @@
from django.utils import timezone
from django.db import IntegrityError
from elasticsearch import Elasticsearch
-from xdata.settings import ALE_URL
+from base import ALE_URL
from axes.decorators import watch_login
from surveyMongoUpdate import sm_request_update, SM_QUESTION_NAME, SM_EXPERIMENT_NAME
import achievements
diff --git a/xdata/base.py b/xdata/settings/base.py
similarity index 96%
rename from xdata/base.py
rename to xdata/settings/base.py
index ae692e0..c8bdeb0 100755
--- a/xdata/base.py
+++ b/xdata/settings/base.py
@@ -12,7 +12,7 @@
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os, sys
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
sys.path.insert(0, os.path.join(BASE_DIR, "op_tasks"))
# Quick-start development settings - unsuitable for production
@@ -30,7 +30,7 @@
ALLOWED_HOSTS = ['*']
-SITE_ROOT = os.path.realpath(os.path.dirname(__file__))
+SITE_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
SITE_ID = 1
diff --git a/xdata/dev.py b/xdata/settings/dev.py
similarity index 94%
rename from xdata/dev.py
rename to xdata/settings/dev.py
index 6f8974c..1a67557 100755
--- a/xdata/dev.py
+++ b/xdata/settings/dev.py
@@ -10,7 +10,7 @@
import os
-from .base import *
+from base import *
INSTALLED_APPS += (
'django_extensions',
diff --git a/xdata/production.py b/xdata/settings/production.py
similarity index 94%
rename from xdata/production.py
rename to xdata/settings/production.py
index 2b171c4..34344a7 100755
--- a/xdata/production.py
+++ b/xdata/settings/production.py
@@ -10,7 +10,7 @@
import os
-from .base import *
+from base import *
INSTALLED_APPS += (
'django_extensions',
diff --git a/xdata/wsgi.py b/xdata/wsgi.py
index 7f486ae..4e5b0d5 100755
--- a/xdata/wsgi.py
+++ b/xdata/wsgi.py
@@ -11,7 +11,11 @@
sys.path.append('/var/www/op_task/xdata')
sys.path.append('/var/www/op_task')
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xdata.production")
+sys.path.append('./xdata/settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "production")
+
+for path in sys.path:
+ print path
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()
