aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorZachary Sloan2013-07-18 14:51:04 -0500
committerZachary Sloan2013-07-18 14:51:04 -0500
commitd9065d1b94c3305f06c4ee368d4b0850b3a96e21 (patch)
treee8c3bbd65c091b2f9514970352fd171b7c43cab5 /wqflask/base
parent917227e5610374f838f3872df2f6df884cb4a239 (diff)
downloadgenenetwork2-d9065d1b94c3305f06c4ee368d4b0850b3a96e21.tar.gz
Added to installation notes
Removed webqtlConfigLocal file containing passwords Updated main page dropdown menus (dataset_menu_structure.json)
Diffstat (limited to 'wqflask/base')
-rwxr-xr-xwqflask/base/webqtlConfig.py3
-rwxr-xr-xwqflask/base/webqtlConfigLocal.py20
2 files changed, 2 insertions, 21 deletions
diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py
index a811c3cd..716986db 100755
--- a/wqflask/base/webqtlConfig.py
+++ b/wqflask/base/webqtlConfig.py
@@ -1,4 +1,3 @@
-from webqtlConfigLocal import *
#########################################'
# Environment Variables - public
#########################################
@@ -49,6 +48,8 @@ UCSC_RUDI_TRACK_URL = " http://genome.cse.ucsc.edu/cgi-bin/hgTracks?org=%s&db=%s
GENOMEBROWSER_URL="http://ucscbrowser.genenetwork.org/cgi-bin/hgTracks?clade=mammal&org=Mouse&db=mm9&position=%s&hgt.suggest=&pix=800&Submit=submit"
ENSEMBLETRANSCRIPT_URL="http://useast.ensembl.org/Mus_musculus/Lucene/Details?species=Mus_musculus;idx=Transcript;end=1;q=%s"
+
+GNROOT = "/home/zas1024/gene/" # Will remove this and dependent items later
SECUREDIR = GNROOT + 'secure/'
COMMON_LIB = GNROOT + 'support/admin'
HTMLPATH = GNROOT + 'web/'
diff --git a/wqflask/base/webqtlConfigLocal.py b/wqflask/base/webqtlConfigLocal.py
deleted file mode 100755
index abaeff93..00000000
--- a/wqflask/base/webqtlConfigLocal.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#########################################'
-# Environment Variables - private
-#########################################
-
-MYSQL_SERVER = 'gn.cazhbciu2y1i.us-east-1.rds.amazonaws.com'
-DB_NAME = 'db_webqtl'
-DB_USER = 'webqtl'
-DB_PASSWD = 'f2ZypIflRM'
-
-MYSQL_UPDSERVER = 'gn.cazhbciu2y1i.us-east-1.rds.amazonaws.com'
-DB_UPDNAME = 'db_webqtl'
-DB_UPDUSER = 'webqtl'
-DB_UPDPASSWD = 'f2ZypIflRM'
-
-GNROOT = '/home/zas1024/gene/'
-ROOT_URL = 'http://50.16.251.170'
-PythonPath = '/usr/bin/python'
-PIDDLE_FONT_PATH = '/usr/lib/python2.4/site-packages/piddle/truetypefonts/'
-
-TEXTUI=1 # XZ: This is to protect GN production server. If set to 0, no text UI is allowed.