diff options
| -rw-r--r-- | genenetwork-development.scm | 25 | ||||
| -rwxr-xr-x | production-deploy.sh | 4 |
2 files changed, 21 insertions, 8 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm index d2dedd0..bfd2fc1 100644 --- a/genenetwork-development.scm +++ b/genenetwork-development.scm @@ -736,6 +736,7 @@ server described by CONFIG, a <genenetwork-configuration> object." (setenv "GIT_SSL_CAINFO" (getenv "SSL_CERT_FILE")) (setenv "CURL_CA_BUNDLE" (getenv "SSL_CERT_FILE")) (setenv "REQUESTS_CA_BUNDLE" (getenv "SSL_CERT_FILE")) + (setenv "SPARQL-ENDPOINT" "http://localhost:9082/sparql/") (setenv "GIT_PAGER" #$(file-append coreutils-minimal "/bin/cat")) (let ((current-repo-path "/home/genenetwork/gn-docs")) (setenv "CURRENT_REPO_PATH" current-repo-path) @@ -1135,12 +1136,6 @@ described by CONFIG, a <genenetwork-configuration> object." (copy-recursively build-directory #$virtuoso-data-dir) ;; Load RDF into virtuoso. (invoke "./pre-inst-env" "./load-rdf.scm" #$connection-settings) - ;; Visualize schema and archive results. - (invoke "./pre-inst-env" "./visualize-schema.scm" #$connection-settings) - (invoke #$(file-append graphviz "/bin/dot") - "-Tsvg" "sql.dot" (string-append "-o" (getenv "ARCHIVE") "/sql.svg")) - (invoke #$(file-append graphviz "/bin/dot") - "-Tsvg" "rdf.dot" (string-append "-o" (getenv "ARCHIVE") "/rdf.svg")) (delete-file-recursively build-directory))))))) (define transform-genenetwork-database-project @@ -1433,6 +1428,19 @@ gn-auth." ";") "proxy_set_header Host $host;"))))))) +(define (gn-guile-reverse-proxy-server-block) + "Return an <nginx-server-configuration> object to reverse proxy +gn-guile to display RDF pages." + (nginx-server-configuration + (server-name '("rdf.genenetwork.org")) + (locations + (list (nginx-location-configuration + (uri "/") + (body (list (string-append "proxy_pass http://localhost:" + (number->string %gn-guile-port) + ";") + "proxy_set_header Host $host;"))))))) + (define set-build-directory-permissions-gexp (with-imported-modules '((guix build utils)) #~(begin @@ -1457,6 +1465,8 @@ gn-auth." (define %gn-auth-port 9094) ;; Port on which virtuoso's SPARQL endpoint is listening (define %virtuoso-sparql-port 9082) +;; Port on which gn-guile is listening +(define %gn-guile-port 8091) (operating-system (host-name "genenetwork-development") @@ -1581,7 +1591,8 @@ gn-auth." (list 'gn-bioinformatics 'guix-bioinformatics)) (tissue-reverse-proxy-server-block) - (gn-auth-reverse-proxy-server-block))))) + (gn-auth-reverse-proxy-server-block) + (gn-guile-reverse-proxy-server-block))))) (service guile-sheepdog-service-type (guile-sheepdog-configuration (settings-file "/etc/genenetwork/conf/sheepdog.scm"))) diff --git a/production-deploy.sh b/production-deploy.sh index c8e30fe..8fb3d36 100755 --- a/production-deploy.sh +++ b/production-deploy.sh @@ -3,6 +3,7 @@ # genenetwork-machines --- Guix configuration for genenetwork machines # Copyright © 2022, 2024 Arun Isaac <arunisaac@systemreboot.net> # Copyright © 2024 Frederick Muriuki Muriithi <fredmanglis@protonmail.com> +# Copyright © 2026 Munyoki Kilyungi <me@bonfacemunyoki.com> # # This file is part of genenetwork-machines. # @@ -24,7 +25,8 @@ container_script=$(guix system container \ --network \ - --load-path=. \ + --load-path=./guix/ \ + --load-path=./ \ --verbosity=3 \ --share=/export/guix-containers/genenetwork/var/genenetwork=/var/genenetwork \ --share=/export/guix-containers/genenetwork/var/lib/acme=/var/lib/acme \ |