about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--genenetwork-development.scm25
1 files changed, 17 insertions, 8 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index 8139635..7c34719 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -465,18 +465,27 @@ server described by CONFIG, a <genenetwork-configuration> object."
             (setenv "GN2_PROFILE" #$(profile
                                      (content (package->development-manifest genenetwork2))
                                      (allow-collisions? #t)))
-            (setenv "GN_PROXY_URL" "http://genenetwork.org/gn3-proxy/")
-            (setenv "GN_SERVER_URL" "https://cd.genenetwork.org/api3/")
-            (setenv "GN3_LOCAL_URL"
-                    #$(string-append "http://localhost:"
-                                     (number->string gn3-port)))
+	    (setenv "GN_SERVER_URL" "https://cd.genenetwork.org/api3/")
+	    (setenv "GN3_LOCAL_URL"
+		    #$(string-append "http://localhost:"
+				     (number->string gn3-port)))
             (setenv "GENENETWORK_FILES" #$genotype-files)
-            (setenv "SQL_URI" "mysql://webqtlout:webqtlout@localhost/db_webqtl")
+	    (setenv "SQL_URI" "mysql://webqtlout:webqtlout@localhost/db_webqtl")
             (setenv "HOME" "/tmp")
             (setenv "NO_REDIS" "no-redis")
 	    (setenv "RUST_BACKTRACE" "1")
-	    (setenv "AUTH_SERVER_URL" "https://auth-cd.genenetwork.org/")
-	    (setenv "GN2_SECRETS" #$gn2-secrets)
+
+	    (setenv
+	     "GN2_SETTINGS"
+	     #$(mixed-text-file "gn2-staging.conf"
+				"GN2_SECRETS=\"" gn2-secrets "\"\n"
+				"GN3_LOCAL_URL=\""
+				(string-append "http://localhost:"
+					       (number->string gn3-port))
+				"\"\n"
+				"GN_SERVER_URL=\"https://cd.genenetwork.org/api3/\"\n"
+				"AUTH_SERVER_URL=\"https://auth-cd.genenetwork.org/\"\n"
+				"SQL_URI=\"mysql://webqtlout:webqtlout@localhost/db_webqtl\"\n"))
 
             ;; Start genenetwork2.
             (with-directory-excursion "genenetwork2"