diff options
| author | Arun Isaac | 2022-10-28 16:20:47 +0530 |
|---|---|---|
| committer | Arun Isaac | 2022-10-28 19:10:43 +0530 |
| commit | 688ae928d748676ba95a3ec9cfffea9e4bd9eba8 (patch) | |
| tree | f3e366867ec7f2d75fa65c6d3e99218bfde54618 /genenetwork-development.scm | |
| parent | 44e7437ba602e732f40781ef76c0065e3bcef7b6 (diff) | |
| download | gn-machines-688ae928d748676ba95a3ec9cfffea9e4bd9eba8.tar.gz | |
Expose xapian index to genenetwork3 instead of genenetwork2.
* genenetwork-development.scm (genenetwork2-shepherd-service): Do not
expose xapian index.
(genenetwork3-shepherd-service): Expose xapian index.
* genenetwork/development-helper.scm (genenetwork2-runner-gexp): Do
not accept xapian index argument.
(genenetwork3-runner-gexp): Accept config file argument.
Diffstat (limited to 'genenetwork-development.scm')
| -rw-r--r-- | genenetwork-development.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm index e345c59..4fb7c46 100644 --- a/genenetwork-development.scm +++ b/genenetwork-development.scm @@ -299,9 +299,6 @@ describing genenetwork2." (source %genotype-files) (target source)) (file-system-mapping - (source %xapian-db-path) - (target source)) - (file-system-mapping (source "/run/mysqld/mysqld.sock") (target source) (writable? #t)) @@ -328,8 +325,7 @@ describing genenetwork2." (content (package->development-manifest genenetwork2)) (allow-collisions? #t)) #$%genenetwork3-port - #$%genotype-files - #$%xapian-db-path)))))) + #$%genotype-files)))))) (define %genenetwork-accounts (list (user-group @@ -460,6 +456,9 @@ command to be executed." (source "/run/mysqld/mysqld.sock") (target source) (writable? #t)) + (file-system-mapping + (source %xapian-db-path) + (target source)) %store-mapping) #:namespaces (delq 'net %namespaces)) "127.0.0.1" #$(number->string (development-server-configuration-port config))) @@ -479,6 +478,8 @@ command to be executed." #~(lambda (latest-gn3-source) ((@@ (genenetwork development-helper) genenetwork3-runner-gexp) latest-gn3-source + #$(mixed-text-file "gn3.conf" + "XAPIAN_DB_PATH=\"" %xapian-db-path "\"\n") #$(profile (content (manifest-cons gunicorn (package->development-manifest genenetwork3))) |