01/01: services: httpd: Allow using it with PHP.

[Christopher Baines]

cbaines pushed a commit to branch master
in repository guix.

commit abc98e3be5fbccf88fe69399db4d83f902b65a15
Author: Florian Pelz <address@hidden>
Date:   Sat Oct 20 18:44:03 2018 +0200

    services: httpd: Allow using it with PHP.
    
    * gnu/services/web.scm (httpd): Make existing httpd-module API public.
    * doc/guix.texi (Apache HTTP Server): Document its usage with PHP-FPM.
    
    Signed-off-by: Christopher Baines <address@hidden>
---
 doc/guix.texi        | 31 +++++++++++++++++++++++++++++++
 gnu/services/web.scm |  5 +++++
 2 files changed, 36 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 12346c4..87579d4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -50,6 +50,7 @@ Copyright @copyright{} 2018 Oleg address@hidden
 Copyright @copyright{} 2018 Mike address@hidden
 Copyright @copyright{} 2018 Pierre-Antoine address@hidden
 Copyright @copyright{} 2018 Gábor address@hidden
+Copyright @copyright{} 2018 Florian address@hidden
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -16612,6 +16613,10 @@ within the store, for example @code{(file-append 
mod-wsgi
 @end table
 @end deffn
 
address@hidden {Scheme Variable} %default-httpd-modules
+A default list of @code{httpd-module} objects.
address@hidden defvr
+
 @deffn {Data Type} httpd-config-file
 This data type represents a configuration file for the httpd service.
 
@@ -16620,6 +16625,32 @@ This data type represents a configuration file for the 
httpd service.
 The modules to load. Additional modules can be added here, or loaded by
 additional configuration.
 
+For example, in order to handle requests for PHP files, you can use Apache’s
address@hidden module along with @code{php-fpm-service-type}:
+
address@hidden
+(service httpd-service-type
+         (httpd-configuration
+          (config
+           (httpd-config-file
+            (modules (cons*
+                      (httpd-module
+                       (name "proxy_module")
+                       (file "modules/mod_proxy.so"))
+                      (httpd-module
+                       (name "proxy_fcgi_module")
+                       (file "modules/mod_proxy_fcgi.so"))
+                      %default-httpd-modules))
+            (extra-config (list "\
+<FilesMatch \\.php$>
+    SetHandler \"proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/\"
+</FilesMatch>"))))))
+(service php-fpm-service-type
+         (php-fpm-configuration
+          (socket "/var/run/php-fpm.sock")
+          (socket-group "httpd")))
address@hidden example
+
 @item @code{server-root} (default: @code{httpd})
 The @code{ServerRoot} in the configuration file, defaults to the httpd
 package. Directives including @code{Include} and @code{LoadModule} are
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 1edb1f4..fcf453c 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -70,6 +70,11 @@
             httpd-config-file-user
             httpd-config-file-group
 
+            <httpd-module>
+            httpd-module
+            httpd-module?
+            %default-httpd-modules
+
             httpd-service-type
 
             <nginx-configuration>