diff options
| -rwxr-xr-x | genenetwork-development-deploy.sh | 1 | ||||
| -rw-r--r-- | genenetwork-development.scm | 26 |
2 files changed, 24 insertions, 3 deletions
diff --git a/genenetwork-development-deploy.sh b/genenetwork-development-deploy.sh index c37295d..03ebb28 100755 --- a/genenetwork-development-deploy.sh +++ b/genenetwork-development-deploy.sh @@ -44,6 +44,7 @@ container_script=$(guix system container --network \ --share=/export/data/genenetwork-sqlite \ --share=/export/data/lmdb \ --share=/export5/tmp=/tmp \ + --share=/export/data/repositories \ --share=/var/run/mysqld=/run/mysqld \ --share=/export/data/gn-docs/ \ genenetwork-development.scm) diff --git a/genenetwork-development.scm b/genenetwork-development.scm index aba78b1..87d8c20 100644 --- a/genenetwork-development.scm +++ b/genenetwork-development.scm @@ -157,6 +157,8 @@ be imported into G-expressions." (default "/export/data/lmdb")) (gn-guile-port genenetwork-configuration-gn-guile-port (default 8091)) + (repositories genenetwork-configuration-repositories + (default "/export/data/repositories")) (gn-doc-git-checkout genenetwork-configuration-gn-doc-git-checkout (default "/export/data/gn-docs"))) @@ -710,7 +712,7 @@ server described by CONFIG, a <genenetwork-configuration> object." "Return shepherd services to run the genenetwork development server described by CONFIG, a <genenetwork-configuration> object." (match-record config <genenetwork-configuration> - (gn2-port gn3-port gn-auth-port genotype-files data-directory xapian-db-path gn2-secrets auth-db-path gn-auth-secrets llm-db-path lmdb-data-path gn-doc-git-checkout gn-guile-port) + (gn2-port gn3-port gn-auth-port genotype-files data-directory xapian-db-path gn2-secrets auth-db-path gn-auth-secrets llm-db-path lmdb-data-path gn-doc-git-checkout gn-guile-port repositories) (list (shepherd-service (documentation "Run gn-guile server.") (provision '(gn-guile)) @@ -733,6 +735,10 @@ described by CONFIG, a <genenetwork-configuration> object." #:mappings (list (file-system-mapping (source gn-doc-git-checkout) (target source) + (writable? #t)) + (file-system-mapping + (source repositories) + (target source) (writable? #t))) #:namespaces (delq 'net %namespaces)) "127.0.0.1" #$(number->string gn-guile-port)) @@ -782,6 +788,10 @@ described by CONFIG, a <genenetwork-configuration> object." #:mappings (list (file-system-mapping (source genotype-files) (target source)) + (file-system-mapping + (source repositories) + (target source) + (writable? #t)) (file-system-mapping (source "/run/mysqld") (target source) @@ -839,6 +849,10 @@ described by CONFIG, a <genenetwork-configuration> object." (source "/run/mysqld") (target source) (writable? #t)) + (file-system-mapping + (source repositories) + (target source) + (writable? #t)) (file-system-mapping (source lmdb-data-path) (target source) @@ -892,6 +906,10 @@ described by CONFIG, a <genenetwork-configuration> object." (source "/run/mysqld") (target source) (writable? #t)) + (file-system-mapping + (source repositories) + (target source) + (writable? #t)) (file-system-mapping (source data-directory) (target source)) @@ -924,7 +942,7 @@ described by CONFIG, a <genenetwork-configuration> object." (define (genenetwork-activation config) (match-record config <genenetwork-configuration> - (gn2-secrets gn3-secrets auth-db-path gn-auth-secrets gn-doc-git-checkout) + (gn2-secrets gn3-secrets auth-db-path gn-auth-secrets gn-doc-git-checkout repositories) (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) @@ -935,7 +953,9 @@ described by CONFIG, a <genenetwork-configuration> object." (passwd:uid (getpw "genenetwork")) (passwd:gid (getpw "genenetwork")))) (cons* #$gn3-secrets - (append (find-files #$gn2-secrets + (append (find-files #$repositories + #:directories? #t) + (find-files #$gn2-secrets #:directories? #t) (find-files gn-doc-git-checkout #:directories? #t) |