Resolved conflicts for pulling from testing branch

5 files changed, 0 insertions, 220 deletions

diff --git a/wqflask/other_config/nginx_conf/gn2-lei.conf b/wqflask/other_config/nginx_conf/gn2-lei.conf
deleted file mode 100644
index 893ad435..00000000
--- a/wqflask/other_config/nginx_conf/gn2-lei.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-server {
-    # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
-    listen 80;
-
-    server_name gn2-lei.genenetwork.org;
-
-    access_log  /var/log/nginx/lei_access.log;
-    error_log  /var/log/nginx/lei_error.log;
-
-    location ^~ /css/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-    location ^~ /javascript/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-#    location ^~ /image/ {
-#           root /gene/wqflask/wqflask/static/;
-#       }
-
-    location ^~ /images/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-    
-    ### New - added by Sam
-    #location ^~ /static/ {
-    #       root /gene/wqflask/wqflask/static/;
-    #}
-
-    location / {
-            proxy_pass         http://127.0.0.1:5001/;
-            proxy_redirect     off;
-
-            proxy_set_header   Host             $host;
-            proxy_set_header   X-Real-IP        $remote_addr;
-            proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
-            
-            proxy_read_timeout 40m;
-    }
-}
diff --git a/wqflask/other_config/nginx_conf/gn2-zach.conf b/wqflask/other_config/nginx_conf/gn2-zach.conf
deleted file mode 100644
index 38347292..00000000
--- a/wqflask/other_config/nginx_conf/gn2-zach.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-server {
-    # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
-    listen 80;
-
-    server_name gn2-zach.genenetwork.org;
-
-    access_log  /var/log/nginx/access.log;
-    error_log  /var/log/nginx/error.log;
-
-    location ^~ /css/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-    location ^~ /javascript/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-#    location ^~ /image/ {
-#           root /gene/wqflask/wqflask/static/;
-#       }
-
-    location ^~ /images/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-    
-    ### New - added by Sam
-    #location ^~ /static/ {
-    #       root /gene/wqflask/wqflask/static/;
-    #}
-
-	location /plink_gemma/ {
-		root /home/zas1024/gene/wqflask/wqflask/;
-		autoindex on;
-	}
-
-	location /download/ {
-		root /home/zas1024/gene/wqflask/wqflask/;
-		autoindex on;
-	}
-
-    location / {
-            proxy_pass         http://127.0.0.1:5002/;
-            proxy_redirect     off;
-
-            proxy_set_header   Host             $host;
-            proxy_set_header   X-Real-IP        $remote_addr;
-            proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
-            
-            proxy_read_timeout 40m;
-    }
-}
-
diff --git a/wqflask/other_config/nginx_conf/gn2.conf b/wqflask/other_config/nginx_conf/gn2.conf
deleted file mode 100644
index a51b4113..00000000
--- a/wqflask/other_config/nginx_conf/gn2.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-server {
-    # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
-    listen 80;
-
-    server_name gn2.genenetwork.org;
-
-    access_log  /var/log/nginx/access.log;
-    error_log  /var/log/nginx/error.log;
-
-    location ^~ /css/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-    location ^~ /javascript/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-#    location ^~ /image/ {
-#           root /gene/wqflask/wqflask/static/;
-#       }
-
-    location ^~ /images/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-    
-    ### New - added by Sam
-    #location ^~ /static/ {
-    #       root /gene/wqflask/wqflask/static/;
-    #}
-
-    location / {
-            proxy_pass         http://127.0.0.1:5000/;
-            proxy_redirect     off;
-
-            proxy_set_header   Host             $host;
-            proxy_set_header   X-Real-IP        $remote_addr;
-            proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
-            
-            proxy_read_timeout 40m;
-    }
-}
diff --git a/wqflask/other_config/nginx_conf/gn2_sam.conf b/wqflask/other_config/nginx_conf/gn2_sam.conf
deleted file mode 100644
index f9abbbd2..00000000
--- a/wqflask/other_config/nginx_conf/gn2_sam.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-server {
-    # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
-    listen 80;
-
-    server_name gn2_sam.genenetwork.org;
-
-    access_log  /var/log/nginx/access.log;
-    error_log  /var/log/nginx/error.log;
-
-    location ^~ /css/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-    location ^~ /javascript/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-#    location ^~ /image/ {
-#           root /gene/wqflask/wqflask/static/;
-#       }
-
-    location ^~ /images/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-    
-    ### New - added by Sam
-    #location ^~ /static/ {
-    #       root /gene/wqflask/wqflask/static/;
-    #}
-
-    location / {
-            proxy_pass         http://127.0.0.1:5005/;
-            proxy_redirect     off;
-
-            proxy_set_header   Host             $host;
-            proxy_set_header   X-Real-IP        $remote_addr;
-            proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
-            
-            proxy_read_timeout 40m;
-    }
-}
-
diff --git a/wqflask/other_config/nginx_conf/penguin.conf b/wqflask/other_config/nginx_conf/penguin.conf
deleted file mode 100644
index c819951c..00000000
--- a/wqflask/other_config/nginx_conf/penguin.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-server {
-    # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
-
-    client_max_body_size 20M;
-    listen 80;
-
-    server_name penguin.uthsc.edu;
-
-    access_log  /var/log/nginx/access.log;
-    error_log  /var/log/nginx/error.log;
-
-    location ^~ /css/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-    location ^~ /javascript/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-
-#    location ^~ /image/ {
-#           root /gene/wqflask/wqflask/static/;
-#       }
-
-    location ^~ /images/ {
-            root /gene/wqflask/wqflask/static/;
-    }
-    
-    ### New - added by Sam
-    #location ^~ /static/ {
-    #       root /gene/wqflask/wqflask/static/;
-    #}
-
-    location / {
-            proxy_pass         http://127.0.0.1:5000/;
-            proxy_redirect     off;
-
-            proxy_set_header   Host             $host;
-            proxy_set_header   X-Real-IP        $remote_addr;
-            proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
-            
-            proxy_read_timeout 40m;
-    }
-}
-