diff options
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/packages/genenetwork.scm | 2 | ||||
| -rw-r--r-- | gn/services/genenetwork.scm | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index 6631053..c2d52e8 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -691,7 +691,7 @@ written in C") (propagated-inputs `(("ghostscript" ,ghostscript) ("graphviz" ,graphviz-2.26) - ("httpd" ,httpd-mod-python-24) + ("httpd" ,httpd22-mod-python-24) ("python24" ,python-2.4) ("python-piddle" ,python24-piddle) ("wget" ,wget))) diff --git a/gn/services/genenetwork.scm b/gn/services/genenetwork.scm index 1998603..ac7ead4 100644 --- a/gn/services/genenetwork.scm +++ b/gn/services/genenetwork.scm @@ -12,7 +12,7 @@ "/lib/python2.4/site-packages") (define %mod-python-path - (file-append httpd-mod-python-24 %python-path)) + (file-append httpd22-mod-python-24 %python-path)) (define %default-httpd22-modules (map (match-lambda @@ -93,19 +93,27 @@ (services (list (service httpd-service-type (httpd-configuration - (package httpd-mod-python-24) ; Must be this package! + (package httpd22-mod-python-24) ; Must be httpd-2.2? (config (httpd-config-file (server-name "www.genenetwork.org") + (server-root httpd22-mod-python-24) ; Defaults to httpd, must be combo package. + (user "nobody") + (group "root") + (pid-file "/tmp/httpd-genenetwork1") + (error-log "/tmp/httpd-genenetwork1-error-log") (document-root (file-append genenetwork1 "/web")) (listen '("8042")) (modules (cons* (httpd-module (name "python_module") (file "modules/mod_python.so")) - %default-httpd-modules)) + %default-httpd22-modules)) (extra-config (list "\ TypesConfig etc/httpd/mime.types +#for apache-2.2, ignored by apache-2.4 +DefaultType application/octet-stream +# Should PythonPath just be genenetwork1/web/webqtl? PythonPath \"sys.path+['" (file-append python-2.4 "/lib/python2.4") "', '" %mod-python-path "', '" (file-append genenetwork1 "/web/webqtl") "']\" <Directory " (file-append genenetwork1 "/web/webqtl") "> AddHandler mod_python .py |