aboutsummaryrefslogtreecommitdiff
path: root/genenetwork/services/genenetwork.scm
diff options
context:
space:
mode:
Diffstat (limited to 'genenetwork/services/genenetwork.scm')
-rw-r--r--genenetwork/services/genenetwork.scm10
1 files changed, 6 insertions, 4 deletions
diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm
index 29a68c0..bc9911e 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -97,11 +97,11 @@
(gn3-data-directory genenetwork-configuration-gn3-data-directory
(default "/var/genenetwork"))
(gn2-secrets genenetwork-configuration-gn2-secrets
- (default "/etc/genenetwork/gn2-secrets.py"))
+ (default "/etc/genenetwork"))
(gn3-secrets genenetwork-configuration-gn3-secrets
(default "/etc/genenetwork/gn3-secrets.py"))
(gn-auth-secrets genenetwork-configuration-gn-auth-secrets
- (default "/etc/genenetwork/gn-auth-secrets.py")))
+ (default "/etc/genenetwork")))
(define-record-type* <gn-uploader-configuration>
gn-uploader-configuration make-gn-uploader-configuration
@@ -201,7 +201,8 @@ object."
(allow-collisions? #t)))
(gn2-conf (computed-file "gn2.conf"
(configuration-file-gexp
- `(("GEMMA_COMMAND" ,(file-append gn2-profile "/bin/gemma"))
+ `(("GN2_SECRETS" ,(string-append gn2-secrets "/gn2-secrets.py"))
+ ("GEMMA_COMMAND" ,(file-append gn2-profile "/bin/gemma"))
("GEMMA_WRAPPER_COMMAND" ,(file-append gn2-profile "/bin/gemma-wrapper"))
("GENENETWORK_FILES" ,genotype-files)
("GN2_SECRETS" ,gn2-secrets)
@@ -224,7 +225,8 @@ object."
("XAPIAN_DB_PATH" ,xapian-db)))))
(gn-auth-conf (computed-file "gn-auth.conf"
(configuration-file-gexp
- `(("AUTH_DB" ,auth-db)
+ `(("GN_AUTH_SECRETS" ,(string-append gn-auth-secrets "/gn-auth-secrets.py"))
+ ("AUTH_DB" ,auth-db)
("SQL_URI" ,sql-uri)
("GN_AUTH_SECRETS" ,gn-auth-secrets)
("CLIENTS_SSL_PUBLIC_KEYS_DIR" ,(string-append gn-auth-secrets "/clients-public-keys"))