From 33e2e09d00881de9b07274bc52b58587e5135cab Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 5 Sep 2018 09:49:09 +0000
Subject: ELASTICSEARCH settings and fix runserver.py to run without gunicorn

---
 etc/default_settings.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'etc/default_settings.py')

diff --git a/etc/default_settings.py b/etc/default_settings.py
index 3e54ad1f..85eab2c6 100644
--- a/etc/default_settings.py
+++ b/etc/default_settings.py
@@ -25,9 +25,17 @@ import os
 import sys
 
 GN_VERSION = open("../etc/VERSION","r").read()
+GN_SERVER_URL = "http://localhost:8880/" # REST API server
+
+# ---- MySQL
+
 SQL_URI = "mysql://gn2:mysql_password@localhost/db_webqtl_s"
 SQL_ALCHEMY_POOL_RECYCLE = 3600
-GN_SERVER_URL = "http://localhost:8880/" # REST API server
+
+# ---- Elastic search
+
+ELASTICSEARCH_HOST = "localhost"
+ELASTICSEARCH_PORT = 9200
 
 # ---- Flask configuration (see website)
 TRAP_BAD_REQUEST_ERRORS = True
-- 
cgit v1.2.3


From 92f505e42c6ac6314b29ac152654b393dc581501 Mon Sep 17 00:00:00 2001
From: Arthur Centeno
Date: Sun, 26 Apr 2020 09:59:25 -0500
Subject: URL for finding services

---
 etc/default_settings.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'etc/default_settings.py')

diff --git a/etc/default_settings.py b/etc/default_settings.py
index 75f84dc4..4a35f42d 100644
--- a/etc/default_settings.py
+++ b/etc/default_settings.py
@@ -28,6 +28,8 @@ GN_VERSION = open("../etc/VERSION","r").read()
 SQL_URI = "mysql://gn2:mysql_password@localhost/db_webqtl_s"
 SQL_ALCHEMY_POOL_RECYCLE = 3600
 GN_SERVER_URL = "http://localhost:8880/" # REST API server
+GN2_BASE_URL = "http://genenetwork.org/"
+GN2_BRANCH_URL = GN2_BASE_URL
 
 # ---- Flask configuration (see website)
 TRAP_BAD_REQUEST_ERRORS = True
-- 
cgit v1.2.3


From e4a2db698b1103e7f6ed5c6e59946e343d3820f8 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Sun, 26 Apr 2020 10:59:24 -0500
Subject: Updated default_settings to include default GN2 base url

---
 etc/default_settings.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'etc/default_settings.py')

diff --git a/etc/default_settings.py b/etc/default_settings.py
index 75f84dc4..e01e4439 100644
--- a/etc/default_settings.py
+++ b/etc/default_settings.py
@@ -28,6 +28,7 @@ GN_VERSION = open("../etc/VERSION","r").read()
 SQL_URI = "mysql://gn2:mysql_password@localhost/db_webqtl_s"
 SQL_ALCHEMY_POOL_RECYCLE = 3600
 GN_SERVER_URL = "http://localhost:8880/" # REST API server
+GN2_BASE_URL = "http://genenetwork.org/" # Main GN2 URL
 
 # ---- Flask configuration (see website)
 TRAP_BAD_REQUEST_ERRORS = True
@@ -43,13 +44,13 @@ SECRET_HMAC_CODE = '\x08\xdf\xfa\x93N\x80\xd9\\H@\\\x9f`\x98d^\xb4a;\xc6OM\x946a
 
 GITHUB_CLIENT_ID = "UNKNOWN"
 GITHUB_CLIENT_SECRET = "UNKNOWN"
-GITHUB_AUTH_URL = "UNKNOWN"
-GITHUB_API_URL = "UNKNOWN"
+GITHUB_AUTH_URL = "https://github.com/login/oauth/authorize"
+GITHUB_API_URL = "https://api.github.com/user"
 
 ORCID_CLIENT_ID = "UNKNOWN"
 ORCID_CLIENT_SECRET = "UNKNOWN"
-ORCID_AUTH_URL = "UNKNOWN"
-ORCID_TOKEN_URL = "UNKNOWN"
+ORCID_AUTH_URL = "https://orcid.org/oauth/authorize"
+ORCID_TOKEN_URL = "https://orcid.org/oauth/token"
 
 ELASTICSEARCH_HOST = "localhost"
 ELASTICSEARCH_PORT = '9200'
-- 
cgit v1.2.3