diff options
| -rw-r--r-- | genenetwork-local-container.scm | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/genenetwork-local-container.scm b/genenetwork-local-container.scm index c6c8738..e839ccb 100644 --- a/genenetwork-local-container.scm +++ b/genenetwork-local-container.scm @@ -82,7 +82,7 @@ "Return a G-expression that runs the latest genenetwork2 development server described by CONFIG, a <genenetwork-configuration> object." (match-record config <genenetwork-configuration> - (gn2-port gn3-port genotype-files) + (gn2-port gn2-secrets gn3-port gn-auth-port genotype-files) (with-packages (list coreutils git-minimal gunicorn nss-certs) (with-imported-modules '((guix build utils)) #~(begin @@ -99,14 +99,20 @@ server described by CONFIG, a <genenetwork-configuration> object." (setenv "GN2_SETTINGS" #$(mixed-text-file "gn2.conf" - "GN2_SECRETS=\"/etc/genenetwork/conf/gn2/secrets.py\"\n" + "GN2_SECRETS=\"" gn2-secrets "\"\n" "AI_SEARCH_ENABLED=True\n" "GN3_LOCAL_URL=\"" (string-append "http://localhost:" (number->string gn3-port)) + "/api/\"\n" + "GN_SERVER_URL=\"" + (string-append "http://localhost:" + (number->string gn3-port)) + "/api/\"\n" + "AUTH_SERVER_URL=\"" + (string-append "http://localhost:" + (number->string gn-auth-port)) "\"\n" - "GN_SERVER_URL=\"http://localhost:8083/api/\"\n" - "AUTH_SERVER_URL=\"http://localhost:8084/\"\n" "SQL_URI=\"mysql://webqtlout:webqtlout@localhost/db_webqtl?unix_socket=/run/mysqld/mysqld.sock&charset=utf8\"\n" "SSL_PRIVATE_KEY=\"/etc/genenetwork/conf/gn2/private.pem\"\n" "AUTH_SERVER_SSL_PUBLIC_KEY=\"/etc/genenetwork/conf/gn-auth/clients-public-keys/gn-auth.pem\"\n")) @@ -131,13 +137,13 @@ server described by CONFIG, a <genenetwork-configuration> object." (setenv "GN3_CONF" #$(mixed-text-file "gn3.conf" "SPARQL_ENDPOINT=\"" sparql-endpoint "\"\n" + "GN3_SECRETS=\"" gn3-secrets "\"\n" "DATA_DIR=\"" data-directory "\"\n" "AUTH_SERVER_URL=\"http://localhost:8084/\"\n" "XAPIAN_DB_PATH=\"" xapian-db-path "\"\n" "AUTH_DB=\"" auth-db-path "\"\n" "LLM_DB_PATH=\"" llm-db-path "\"\n")) (setenv "HOME" "/tmp") - (setenv "GN3_SECRETS" #$gn3-secrets) (setenv "RSCRIPT" #$(file-append (profile (content (package->development-manifest genenetwork3)) @@ -169,7 +175,7 @@ server described by CONFIG, a <genenetwork-configuration> object." "LOGLEVEL=\"DEBUG\"\n" "SQL_URI=\"mysql://webqtlout:webqtlout@localhost/db_webqtl?unix_socket=/run/mysqld/mysqld.sock\"\n" "AUTH_DB=\"" auth-db-path "\"\n" - "GN_AUTH_SECRETS=\"/etc/genenetwork/conf/gn-auth/secrets.py\"\n" + "GN_AUTH_SECRETS=\"" gn-auth-secrets "\"\n" "CLIENTS_SSL_PUBLIC_KEYS_DIR=\"/etc/genenetwork/conf/gn-auth/clients-public-keys/\"\n" "SSL_PRIVATE_KEY=\"/etc/genenetwork/conf/gn-auth/private.pem\"\n")) (setenv "HOME" "/tmp") |