about summary refs log tree commit diff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/default_settings.py26
1 files changed, 12 insertions, 14 deletions
diff --git a/etc/default_settings.py b/etc/default_settings.py
index aa4e8d83..28547212 100644
--- a/etc/default_settings.py
+++ b/etc/default_settings.py
@@ -14,7 +14,9 @@
 # Note: values for False and 0 have to be strings here - otherwise
 # Flask won't pick them up
 #
-# Final note: see below information to pick up the GNU Guix paths
+# For GNU Guix deployment also check the paths in
+#
+#  ~/.guix-profile/lib/python2.7/site-packages/genenetwork2-2.0-py2.7.egg/etc/default_settings.py
 
 import os
 import sys
@@ -24,7 +26,7 @@ SQLALCHEMY_DATABASE_URI = 'mysql://gn2:mysql_password@localhost/db_webqtl_s'
 SQLALCHEMY_POOL_RECYCLE = 3600
 GN_SERVER_URL = "http://localhost:8880/"
 
-# Flask configuration (see website)
+# ---- Flask configuration (see website)
 TRAP_BAD_REQUEST_ERRORS = True
 SECURITY_CONFIRMABLE = True
 SECURITY_TRACKABLE = True
@@ -36,8 +38,8 @@ SECURITY_POST_LOGIN_VIEW = "/thank_you"
 SERVER_PORT = 5003
 SECRET_HMAC_CODE = '\x08\xdf\xfa\x93N\x80\xd9\\H@\\\x9f`\x98d^\xb4a;\xc6OM\x946a\xbc\xfc\x80:*\xebc'
 
-# Behavioural settings (defaults) note that logger and log levels can
-# be overridden at the module level and with enviroment settings
+# ---- Behavioural settings (defaults) note that logger and log levels can
+#      be overridden at the module level and with enviroment settings
 WEBSERVER_MODE  = 'DEV'     # Python webserver mode (DEBUG|DEV|PROD)
 WEBSERVER_BRANDING = None   # Set the branding (nyi)
 WEBSERVER_DEPLOY = None     # Deployment specifics (nyi)
@@ -51,22 +53,18 @@ LOG_BENCH       = True      # Log bench marks
 USE_REDIS       = True      # REDIS caching (note that redis will be phased out)
 USE_GN_SERVER   = 'False'   # Use GN_SERVER SQL calls
 
-# For GNU Guix deployment also check the paths in
-#
-#  ~/.guix-profile/lib/python2.7/site-packages/genenetwork2-2.0-py2.7.egg/etc/default_settings.py
+# Paths to JS libraries
 
-# General paths for Genenetwork
+BIODALLIANCE_JS = os.environ['HOME']+"/genenetwork/biodalliance"
 
+# ---- Path overrides for Genenetwork
+# TMPDIR is normally picked up from the environment
 HOME=os.environ['HOME']
 LOGFILE = HOME+"/genenetwork2.log"
-GENENETWORK_FILES = HOME+"/gn2_data"
-
-# Paths to JS libraries
-
-BIODALLIANCE_JS = os.environ['HOME']+"/genenetwork/biodalliance"
+GENENETWORK_FILES = HOME+"/gn2_data"  # base dir for all static data files
 
+# ---- GN2 Executables
 # Paths to invoked binaries
-
 PYLMM_COMMAND = str.strip(os.popen("which pylmm_redis").read())
 PLINK_COMMAND = str.strip(os.popen("which plink2").read())
 GEMMA_COMMAND = str.strip(os.popen("which gemma").read())