projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update settings for new location of WSGI_APPLICATION, and add a reminder about where...
[htsworkflow.git]
/
htsworkflow
/
settings.py
diff --git
a/htsworkflow/settings.py
b/htsworkflow/settings.py
index c366ce32a238deac74491ad3300a7d2d343bf11f..b44a5884eda96acb4b9687b630f8197acd40e396 100644
(file)
--- a/
htsworkflow/settings.py
+++ b/
htsworkflow/settings.py
@@
-22,13
+22,13
@@
SECRET_KEY = 'c=5&609$7)bm_u+3$2bi=ida$*a)c1(cp_0siua7uyww!1qfg_'
DEFAULT_API_KEY = 'n7HsXGHIi0vp9j5u4TIRJyqAlXYc4wrH'
# SECURITY WARNING: don't run with debug turned on in production!
DEFAULT_API_KEY = 'n7HsXGHIi0vp9j5u4TIRJyqAlXYc4wrH'
# SECURITY WARNING: don't run with debug turned on in production!
+# Override in settings_local
DEBUG = True
TEMPLATE_DEBUG = True
ALLOWED_HOSTS = ['jumpgate.caltech.edu']
DEBUG = True
TEMPLATE_DEBUG = True
ALLOWED_HOSTS = ['jumpgate.caltech.edu']
-
# Application definition
AUTHENTICATION_BACKENDS = (
'htsworkflow.frontend.samples.auth_backend.HTSUserModelBackend', )
# Application definition
AUTHENTICATION_BACKENDS = (
'htsworkflow.frontend.samples.auth_backend.HTSUserModelBackend', )
@@
-66,9
+66,8
@@
TEMPLATE_DIRS = (
)
ROOT_URLCONF = 'htsworkflow.frontend.urls'
)
ROOT_URLCONF = 'htsworkflow.frontend.urls'
-#ROOT_URLCONF='wsgiexample.urls'
-WSGI_APPLICATION = '
htsworkflow.frontend.
wsgi.application'
+WSGI_APPLICATION = 'wsgi.application'
# Database
# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
# Database
# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
@@
-80,6
+79,8
@@
DATABASES = {
}
}
}
}
+EMAIL_HOST = 'localhost'
+
# Internationalization
# https://docs.djangoproject.com/en/1.6/topics/i18n/
# Internationalization
# https://docs.djangoproject.com/en/1.6/topics/i18n/
@@
-98,8
+99,14
@@
USE_TZ = True
# https://docs.djangoproject.com/en/1.6/howto/static-files/
STATIC_URL = '/static/'
# https://docs.djangoproject.com/en/1.6/howto/static-files/
STATIC_URL = '/static/'
+
+#####
+# Application specific settings
+# Update this in settings_local to point to your flowcell result directory
+RESULT_HOME_DIR = os.path.join(BASE_DIR, 'test', 'results')
+
try:
# allow local customizations
from settings_local import *
except ImportError as e:
try:
# allow local customizations
from settings_local import *
except ImportError as e:
- pass
\ No newline at end of file
+ pass