aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2024-08-07 13:10:59 -0500
committerFrederick Muriuki Muriithi2024-08-07 13:10:59 -0500
commit2411ec65a333a43b5fcc5030a2b24a95845fd6ec (patch)
tree03a49d74b7e55e80b016f24acd8dfd485b5dba7d
parent153f96ee367a4b596c17da5b3926d76477eae070 (diff)
downloadgn-machines-2411ec65a333a43b5fcc5030a2b24a95845fd6ec.tar.gz
gn-uploader: Add `AUTH_SERVER_URL` to the configurations.
-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 83a33fd..3691314 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -119,6 +119,8 @@
(default "/var/genenetwork"))
(secrets gn-uploader-configuration-secrets
(default "/etc/genenetwork/gn-uploader-secrets.py"))
+ (auth-server-url gn-uploader-auth-server-url
+ (default "https://auth.genenetwork.org"))
(log-level gn-uploader-log-level (default "WARNING")))
(define %genenetwork-accounts
@@ -514,7 +516,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)
+ (gn-uploader sql-uri port data-directory secrets log-level auth-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
@@ -526,7 +528,8 @@ a @code{<genenetwork-configuration>} record."
`(("UPLOADER_SECRETS" ,secrets)
("SQL_URI" ,sql-uri)
("UPLOAD_FOLDER" ,(string-append data-directory
- "/uploads"))))))
+ "/uploads"))
+ ("AUTH_SERVER_URL" ,auth-server-url)))))
(gn-uploader-profile (profile
(content (package->development-manifest gn-uploader))
(allow-collisions? #t))))
diff --git a/uploader.scm b/uploader.scm
index 1bd14d9..400c6ac 100644
--- a/uploader.scm
+++ b/uploader.scm
@@ -81,5 +81,6 @@
(secrets "/etc/genenetwork/gn-uploader/gn-uploader-secrets.py")
(sql-uri "mysql://webqtlout:webqtlout@127.0.0.1:3307/db_webqtl")
(data-directory "/export/data/uploader/gn-uploader")
- (log-level "DEBUG")))
+ (log-level "DEBUG")
+ (auth-server-url "https://staging-auth.genenetwork.org/")))
%base-services)))