From 8677d1b7bd5b32791c440bf0de2fc4c61c98299f Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Sun, 21 May 2017 07:21:44 +0000
Subject: Merge from the diet branch.

  * refactored ./bin/genenetwork2 and /etc/default_settings
    - better detection of Guix
    - removed unused parameters, such as GEMMA_RESULT_PATH and TEMP_TRAITS
    - removing some default settings, such as PYLMM_COMMAND
    - rename some settings, such as SQL_URI and LOG_SQL_ALCHEMY
    - added GUIX_JS_PATH for JS modules
  * Added documentation on installing binary GN2
  * Updated Twitter board to latest version in Guix - it had broken
  * Updated many tools in the latest Guix profile
---
 etc/VERSION | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 etc/VERSION

(limited to 'etc/VERSION')

diff --git a/etc/VERSION b/etc/VERSION
new file mode 100644
index 00000000..1785aa28
--- /dev/null
+++ b/etc/VERSION
@@ -0,0 +1 @@
+2.10rc3
-- 
cgit v1.2.3


From a2325f723052ff951200020f9b072a2dd5140c01 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 20 Dec 2017 10:14:35 -0600
Subject: VERSION

---
 VERSION     | 2 +-
 etc/VERSION | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 120000 VERSION

(limited to 'etc/VERSION')

diff --git a/VERSION b/VERSION
deleted file mode 100644
index 6a5fe6e8..00000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.11
diff --git a/VERSION b/VERSION
new file mode 120000
index 00000000..a9a7884c
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+etc/VERSION
\ No newline at end of file
diff --git a/etc/VERSION b/etc/VERSION
index 1785aa28..b624c74a 100644
--- a/etc/VERSION
+++ b/etc/VERSION
@@ -1 +1 @@
-2.10rc3
+2.10rc5
-- 
cgit v1.2.3


From 85316a82ec5df2c155f3c4d1dfd3739acf3d4145 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Mon, 29 Jan 2018 11:11:02 +0000
Subject: Bumped version

---
 etc/VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'etc/VERSION')

diff --git a/etc/VERSION b/etc/VERSION
index b624c74a..ca9e199c 100644
--- a/etc/VERSION
+++ b/etc/VERSION
@@ -1 +1 @@
-2.10rc5
+2.11-rc1
-- 
cgit v1.2.3


From 9544ca2e6461b267c28d9a4c7fe976bc34f10be3 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Mon, 2 Apr 2018 08:52:52 +0000
Subject: Version bump Config files are store in
 https://github.com/genenetwork/gn-deploy-servers repo

---
 etc/VERSION                |  2 +-
 etc/nginx-genenetwork.conf | 54 ----------------------------------------------
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 etc/nginx-genenetwork.conf

(limited to 'etc/VERSION')

diff --git a/etc/VERSION b/etc/VERSION
index ca9e199c..a4320e6f 100644
--- a/etc/VERSION
+++ b/etc/VERSION
@@ -1 +1 @@
-2.11-rc1
+2.11-rc2
diff --git a/etc/nginx-genenetwork.conf b/etc/nginx-genenetwork.conf
deleted file mode 100644
index 06fd3c57..00000000
--- a/etc/nginx-genenetwork.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-user  nobody;
-worker_processes  4;
-pid /var/run/nginx.pid;
-
-error_log  /var/log/nginx/error.log;
-
-events {
-    worker_connections  16;
-}
-
-http {
-    include       mime.types;
-    # default_type  application/octet-stream;
-
-    # sendfile        on;
-    keepalive_timeout  480;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-    }
-
-    server {
-        listen 80;
-        server_name test-gn2.genenetwork.org;
-        access_log  logs/test-gn2.access.log;
-
-        proxy_connect_timeout       3000;
-        proxy_send_timeout          3000;
-        proxy_read_timeout          3000;
-        send_timeout                3000;
-
-        location / {
-            # proxy_set_header   Host $host;
-            proxy_set_header   Host      $http_host;
-            # proxy_redirect     off;
-            proxy_set_header   Connection keep-alive;
-            proxy_set_header   X-Real-IP $remote_addr;
-            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header   X-Forwarded-Host $server_name;
-            proxy_pass         http://127.0.0.1:5003;
-        }
-    }
-}
-- 
cgit v1.2.3