aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--genenetwork/services/genenetwork.scm7
-rw-r--r--uploader.scm3
2 files changed, 7 insertions, 3 deletions
diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm
index 3691314..37793a5 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -121,6 +121,8 @@
(default "/etc/genenetwork/gn-uploader-secrets.py"))
(auth-server-url gn-uploader-auth-server-url
(default "https://auth.genenetwork.org"))
+ (gn2-server-url gn-uploader-gn2-server-url
+ (default "https://genenetwork.org"))
(log-level gn-uploader-log-level (default "WARNING")))
(define %genenetwork-accounts
@@ -516,7 +518,7 @@ a @code{<genenetwork-configuration>} record."
(define (gn-uploader-gunicorn-app config)
(match-record config <gn-uploader-configuration>
- (gn-uploader sql-uri port data-directory secrets log-level auth-server-url)
+ (gn-uploader sql-uri port data-directory secrets log-level auth-server-url gn2-server-url)
;; If we mapped only the mysqld.sock socket file, it would break
;; when the external mysqld server is restarted.
(let ((database-mapping (file-system-mapping
@@ -529,7 +531,8 @@ a @code{<genenetwork-configuration>} record."
("SQL_URI" ,sql-uri)
("UPLOAD_FOLDER" ,(string-append data-directory
"/uploads"))
- ("AUTH_SERVER_URL" ,auth-server-url)))))
+ ("AUTH_SERVER_URL" ,auth-server-url)
+ ("GN2_SERVER_URL" ,gn2-server-url)))))
(gn-uploader-profile (profile
(content (package->development-manifest gn-uploader))
(allow-collisions? #t))))
diff --git a/uploader.scm b/uploader.scm
index 400c6ac..62ab35f 100644
--- a/uploader.scm
+++ b/uploader.scm
@@ -82,5 +82,6 @@
(sql-uri "mysql://webqtlout:webqtlout@127.0.0.1:3307/db_webqtl")
(data-directory "/export/data/uploader/gn-uploader")
(log-level "DEBUG")
- (auth-server-url "https://staging-auth.genenetwork.org/")))
+ (auth-server-url "https://staging-auth.genenetwork.org/")
+ (gn2-server-url "https://staging.genenetwork.org")))
%base-services)))