genenetwork1 httpd.conf parametrization

1 files changed, 13 insertions, 14 deletions

diff --git a/gn/services/gn1-httpd-config.scm b/gn/services/gn1-httpd-config.scm
index 6b2397d..fdc5f71 100644
--- a/gn/services/gn1-httpd-config.scm
+++ b/gn/services/gn1-httpd-config.scm
@@ -1,6 +1,7 @@
 (define-module (gn services gn1-httpd-config)
-               #:export (%default-httpd22-modules
-                         GN1-httpd-config))
+  #:export (%default-httpd22-modules
+            GN1-httpd-config-prod
+            ))
 
 (use-modules (gnu)
              (ice-9 match)
@@ -62,18 +63,9 @@
          ("alias_module" "modules/mod_alias.so")
          ("rewrite_module" "modules/mod_rewrite.so"))))
 
-; Alternative setup
-;  (let* ((gn1-user "wrk")
-;        (gn1-source "/home/wrk/gn1-pjotr/gnshare/gn")
-;        (gn1-server "gn1-pjotr.genenetwork.org")
-;        (gn1-port "8043"))
-
-
-(define GN1-httpd-config
-  (let* ((gn1-user "gn1")
-	 (gn1-source (string-append "/home/" gn1-user "/production/gnshare/gn"))
-	 (gn1-server "gn1.genenetwork.org")
-	 (gn1-port "8042"))
+(define (GN1-httpd-config gn1-user cwd url gn1-port)
+  (let* ((gn1-source cwd)
+	 (gn1-server url))
   (httpd-config-file
     (server-name gn1-server)
     ;; Defaults to httpd, should be same as 'package' above to launch service.
@@ -134,3 +126,10 @@ NameVirtualHost *:" gn1-port "
 #   PythonHandler mod_python.testhandler
 # </Location>"
 )))))
+
+(define GN1-httpd-config-prod
+  (GN1-httpd-config "gn1"
+                    "/home/gn1/production/gnshare/gn"
+                    "gn1.genenetwork.org"
+                    "8042"
+                    ))