From 9b0264bf13e994298de95a4e08198336b6c97a38 Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Thu, 7 Feb 2013 17:58:34 -0600
Subject: Added code to marker_regression.py that creates the numpy arrays to
 pass to Nick's code and changed the prep_data.py code to operate on a list of
 phenotype values instead of a textfile with the values delimited

---
 wqflask/base/webqtlConfigLocal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask/base/webqtlConfigLocal.py')

diff --git a/wqflask/base/webqtlConfigLocal.py b/wqflask/base/webqtlConfigLocal.py
index 84686234..8e3e0bbe 100755
--- a/wqflask/base/webqtlConfigLocal.py
+++ b/wqflask/base/webqtlConfigLocal.py
@@ -12,7 +12,7 @@ DB_UPDNAME = 'db_webqtl_zas1024'
 DB_UPDUSER = 'webqtl'
 DB_UPDPASSWD = 'webqtl'
 
-GNROOT = '/home/zas1024/gn/'
+GNROOT = '/home/zas1024/gene/'
 ROOT_URL = 'http://alexandria.uthsc.edu:91/'
 PythonPath = '/usr/bin/python'
 PIDDLE_FONT_PATH = '/usr/lib/python2.4/site-packages/piddle/truetypefonts/'
-- 
cgit v1.2.3


From 5bfe4e6c590bf0ade2312536f0f8e3ce055e2c75 Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Fri, 22 Feb 2013 22:18:38 +0000
Subject: Added some to notes

---
 misc/notes.txt                    | 12 ++++++++++++
 wqflask/base/webqtlConfigLocal.py | 14 +++++++-------
 wqflask/cfg/zach_settings.py      |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'wqflask/base/webqtlConfigLocal.py')

diff --git a/misc/notes.txt b/misc/notes.txt
index fd08d9a2..ed0390e1 100644
--- a/misc/notes.txt
+++ b/misc/notes.txt
@@ -4,11 +4,15 @@ git clone http://github.com/zsloan/genenetwork.git gene
 Pull from branch in git repository:
 git pull origin flask(or whatever the branch is)
 
+Add all files in current directory branch to be staged to be committed
+git add -A
+
 
 **** apt-get is an Ubuntu system-wide package manager, while pip is a Python-only system
 for python packages ****
 
 Upgrade system packages for security updates, etc:
+apt-get update
 apt-get upgrade
 
 **"apt-cache search" searches for text in the description for various packages, while
@@ -70,6 +74,14 @@ python runserver.py
 
 ===========================================
 
+Redis things
+
+Restart redis server:
+sudo /etc/init.d/redis_6379 stop
+sudo /etc/init.d/redis_6379 start
+
+===========================================
+
 Start screen session:
 byobu -RD (to start)
 control-a then :multiuser on
diff --git a/wqflask/base/webqtlConfigLocal.py b/wqflask/base/webqtlConfigLocal.py
index 8e3e0bbe..abaeff93 100755
--- a/wqflask/base/webqtlConfigLocal.py
+++ b/wqflask/base/webqtlConfigLocal.py
@@ -2,18 +2,18 @@
 #      Environment Variables - private
 #########################################
 
-MYSQL_SERVER = 'localhost'
-DB_NAME = 'db_webqtl_zas1024'
+MYSQL_SERVER = 'gn.cazhbciu2y1i.us-east-1.rds.amazonaws.com'
+DB_NAME = 'db_webqtl'
 DB_USER = 'webqtl'
-DB_PASSWD = 'webqtl'
+DB_PASSWD = 'f2ZypIflRM'
 
-MYSQL_UPDSERVER = 'localhost'
-DB_UPDNAME = 'db_webqtl_zas1024'
+MYSQL_UPDSERVER = 'gn.cazhbciu2y1i.us-east-1.rds.amazonaws.com'
+DB_UPDNAME = 'db_webqtl'
 DB_UPDUSER = 'webqtl'
-DB_UPDPASSWD = 'webqtl'
+DB_UPDPASSWD = 'f2ZypIflRM'
 
 GNROOT = '/home/zas1024/gene/'
-ROOT_URL = 'http://alexandria.uthsc.edu:91/'
+ROOT_URL = 'http://50.16.251.170'
 PythonPath = '/usr/bin/python'
 PIDDLE_FONT_PATH = '/usr/lib/python2.4/site-packages/piddle/truetypefonts/'
 
diff --git a/wqflask/cfg/zach_settings.py b/wqflask/cfg/zach_settings.py
index 8d3bf4ab..1970bd9c 100644
--- a/wqflask/cfg/zach_settings.py
+++ b/wqflask/cfg/zach_settings.py
@@ -2,4 +2,4 @@ LOGFILE = """/tmp/flask_gn_log"""
 
 TRAP_BAD_REQUEST_ERRORS = True
 
-DB_URI = """mysql://webqtl:webqtl@localhost/db_webqtl_zas1024"""
\ No newline at end of file
+DB_URI = """mysql://webqtl:f2ZypIflRM@gn.cazhbciu2y1i.us-east-1.rds.amazonaws.com/db_webqtl"""
-- 
cgit v1.2.3