aboutsummaryrefslogtreecommitdiff
path: root/genenetwork
diff options
context:
space:
mode:
authorPjotr Prins2024-04-01 01:59:51 -0500
committerPjotr Prins2024-04-01 02:54:51 -0500
commit0d551870499c886f900a5b87b2040db25e9a00cc (patch)
tree26d5cf12383b405258baa1e3a1c513c6cd094fde /genenetwork
parentbfb58e7db7c8529fc45940528c8c443fe9c00fd4 (diff)
downloadgn-machines-0d551870499c886f900a5b87b2040db25e9a00cc.tar.gz
fallback: have gn2 and gn3 share a source directory so we can update/debug source code for development. See
topics/systems/debug-and-developing-code-with-genenetwork-system-container.gmi
Diffstat (limited to 'genenetwork')
-rw-r--r--genenetwork/services/genenetwork.scm12
1 files changed, 11 insertions, 1 deletions
diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm
index 5e97454..0fc2fae 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -47,6 +47,7 @@
genenetwork-configuration-xapian-db
genenetwork-configuration-genotype-files
genenetwork-configuration-sparql-endpoint
+ genenetwork-configuration-gn-sourcecode-directory
genenetwork-configuration-gn3-data-directory
genenetwork-configuration-gn2-secrets
genenetwork-configuration-gn3-secrets
@@ -86,6 +87,8 @@
(default "/var/genenetwork/genotype-files"))
(sparql-endpoint genenetwork-configuration-sparql-endpoint
(default "http://localhost:8081/sparql"))
+ (gn-sourcecode-directory genenetwork-configuration-gn-sourcecode-directory
+ (default "/var/empty"))
(gn3-data-directory genenetwork-configuration-gn3-data-directory
(default "/var/genenetwork"))
(gn2-secrets genenetwork-configuration-gn2-secrets
@@ -180,7 +183,7 @@ G-expressions or numbers."
described by @var{config}, a @code{<genenetwork-configuration>}
object."
(match-record config <genenetwork-configuration>
- (genenetwork2 genenetwork3 gn-auth server-name gn-auth-server-name gn2-port gn3-port gn-auth-port sql-uri auth-db xapian-db genotype-files sparql-endpoint gn3-data-directory gn2-secrets gn3-secrets gn-auth-secrets)
+ (genenetwork2 genenetwork3 gn-auth server-name gn-auth-server-name gn2-port gn3-port gn-auth-port sql-uri auth-db xapian-db genotype-files sparql-endpoint gn-sourcecode-directory gn3-data-directory gn2-secrets gn3-secrets gn-auth-secrets)
;; 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
@@ -207,6 +210,7 @@ object."
(configuration-file-gexp
`(("AUTH_DB" ,auth-db)
("DATA_DIR" ,gn3-data-directory)
+ ("SOURCE_DIR" ,gn-sourcecode-directory)
("SPARQL_ENDPOINT" ,sparql-endpoint)
("SQL_URI" ,sql-uri)
("XAPIAN_DB_PATH" ,xapian-db)))))
@@ -237,6 +241,9 @@ object."
(source genotype-files)
(target source))
(file-system-mapping
+ (source gn-sourcecode-directory)
+ (target source))
+ (file-system-mapping
(source gn2-conf)
(target source))
(file-system-mapping
@@ -274,6 +281,9 @@ object."
(source gn3-secrets)
(target source))
(file-system-mapping
+ (source gn-sourcecode-directory)
+ (target source))
+ (file-system-mapping
(source gn3-data-directory)
(target source))
(file-system-mapping