aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2023-11-13 07:42:04 +0300
committerFrederick Muriuki Muriithi2023-11-13 07:42:04 +0300
commit8b112a636376ba33395909b7659d77bd8068d8d9 (patch)
treed86a7e4da4bb2c53a9da093897b8ac67939593af
parentc2b2866f98aa74d77687060f48be1460f5b4471e (diff)
downloadgn-machines-8b112a636376ba33395909b7659d77bd8068d8d9.tar.gz
GN Secrets: Set up secrets files for GN2 and GN3
-rw-r--r--genenetwork-development.scm11
1 files changed, 10 insertions, 1 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index 41bd095..5d71787 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -203,7 +203,6 @@ executed."
(setenv "GENENETWORK_FILES" #$genotype-files)
(setenv "HOME" "/tmp")
(setenv "SQL_URI" "mysql://webqtlout:webqtlout@localhost/db_webqtl")
- (setenv "GN2_SETTINGS" "/etc/genenetwork/conf/gn2_settings.py")
(chdir "genenetwork2")
(apply invoke '#$test-command))))))
@@ -461,6 +460,7 @@ server described by CONFIG, a <genenetwork-configuration> object."
(setenv "NO_REDIS" "no-redis")
(setenv "RUST_BACKTRACE" "1")
(setenv "AUTH_SERVER_URL" "https://auth-cd.genenetwork.org/")
+ (setenv "GN2_SECRETS" "/etc/genenetwork/conf/gn2/secrets.py")
;; Start genenetwork2.
(with-directory-excursion "genenetwork2"
@@ -500,6 +500,7 @@ server described by CONFIG, a <genenetwork-configuration> object."
"XAPIAN_DB_PATH=\"" xapian-db-path "\"\n"
"AUTH_DB=\"" auth-db-path "\"\n"))
(setenv "HOME" "/tmp")
+ (setenv "GN3_SECRETS" "/etc/genenetwork/conf/gn3/secrets.py")
;; Run genenetwork3.
(with-directory-excursion "genenetwork3"
(show-head-commit)
@@ -569,6 +570,10 @@ described by CONFIG, a <genenetwork-configuration> object."
(file-system-mapping
(source "/run/mysqld")
(target source)
+ (writable? #t))
+ (file-system-mapping
+ (source "/etc/genenetwork/conf/gn2")
+ (target source)
(writable? #t)))
#:namespaces (delq 'net %namespaces))
"127.0.0.1" #$(number->string gn2-port))
@@ -598,6 +603,10 @@ described by CONFIG, a <genenetwork-configuration> object."
(file-system-mapping
(source xapian-db-path)
(target source))
+ (file-system-mapping
+ (source "/etc/genenetwork/conf/gn3")
+ (target source)
+ (writable? #t))
(file-system-mapping
(source auth-db-path)
(target source)