Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing

1 files changed, 0 insertions, 108 deletions

diff --git a/wqflask/other_config/nginx-old.conf b/wqflask/other_config/nginx-old.conf
deleted file mode 100644
index 65ee768c..00000000
--- a/wqflask/other_config/nginx-old.conf
+++ /dev/null
@@ -1,108 +0,0 @@
-
-#user  nobody;
-worker_processes  1;
-
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
-
-#pid        logs/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-    #                  '$status $body_bytes_sent "$http_referer" '
-    #                  '"$http_user_agent" "$http_x_forwarded_for"';
-
-    #access_log  logs/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    #keepalive_timeout  0;
-    keepalive_timeout  65;
-
-    gzip  on;
-
-    server {
-	# Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
-	listen 80;
-
-    	server_name _;
-
-    	access_log  /var/log/nginx/access.log;
-    	error_log  /var/log/nginx/error.log;
-
-	location ^~ /css/ {
-		root /home/sam/gene/wqflask/wqflask/static/;
-	}
-
-	location ^~ /javascript/ {
-		root /home/sam/gene/wqflask/wqflask/static/;
-	}
-
-#    location ^~ /image/ {
-#		root /home/sam/gene/wqflask/wqflask/static/;
-#	}
-
-	location ^~ /images/ {
-		root /home/sam/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;
-   	 }
-
-    }
-
-
-    # another virtual host using mix of IP-, name-, and port-based configuration
-    #
-    #server {
-    #    listen       8000;
-    #    listen       somename:8080;
-    #    server_name  somename  alias  another.alias;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
-    #}
-
-
-    # HTTPS server
-    #
-    #server {
-    #    listen       443;
-    #    server_name  localhost;
-
-    #    ssl                  on;
-    #    ssl_certificate      cert.pem;
-    #    ssl_certificate_key  cert.key;
-
-    #    ssl_session_timeout  5m;
-
-    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
-    #    ssl_ciphers  HIGH:!aNULL:!MD5;
-    #    ssl_prefer_server_ciphers   on;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
-    #}
-
-}