Clean-up Apache and Nginx parts

Author: wouterj

setup/web_server_configuration.rst

@@ -25,13 +25,12 @@ with Apache or Nginx.
     another location (e.g. ``public_html/``) make sure you
     :ref:`override the location of the public/ directory <override-web-dir>`.
 
-Apache with PHP-FPM
+Configuring PHP-FPM
 -------------------
 
-To make use of PHP-FPM with Apache, you first have to ensure that you have
-the FastCGI process manager ``php-fpm`` binary and Apache's FastCGI module
-installed (for example, on a Debian based system you have to install the
-``libapache2-mod-fastcgi`` and ``php7.4-fpm`` packages).
+All configuration examples below use the PHP FastCGI process manager
+(PHP-FPM). Ensure that you have installed PHP-FPM (for example, on a Debian
+based system you have to install the ``php-fpm`` package).
 
 PHP-FPM uses so-called *pools* to handle incoming FastCGI requests. You can
 configure an arbitrary number of pools in the FPM configuration. In a pool
@@ -40,6 +39,8 @@ listen on. Each pool can also be run under a different UID and GID:
 
 .. code-block:: ini
 
+    ; /etc/php/7.4/fpm/pool.d/www.conf
+
     ; a pool called www
     [www]
     user = www-data
@@ -48,19 +49,21 @@ listen on. Each pool can also be run under a different UID and GID:
     ; use a unix domain socket
     listen = /var/run/php/php7.4-fpm.sock
 
-    ; or listen on a TCP socket
-    listen = 127.0.0.1:9000
+    ; or listen on a TCP connection
+    ;listen = 127.0.0.1:9000
 
-Using mod_proxy_fcgi with Apache 2.4
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Apache
+------
 
-If you are running Apache 2.4, you can use ``mod_proxy_fcgi`` to pass incoming
-requests to PHP-FPM. Configure PHP-FPM to listen on a TCP or Unix socket, enable
-``mod_proxy`` and ``mod_proxy_fcgi`` in your Apache configuration, and use the
-``SetHandler`` directive to pass requests for PHP files to PHP FPM:
+If you are running Apache 2.4+, you can use ``mod_proxy_fcgi`` to pass
+incoming requests to PHP-FPM. Install the Apache2 FastCGI mod
+(``libapache2-mod-fastcgi`` on Debian), enable ``mod_proxy`` and
+``mod_proxy_fcgi`` in your Apache configuration, and use the ``SetHandler``
+directive to pass requests for PHP files to PHP FPM:
 
 .. code-block:: apache
 
+    # /etc/apache2/conf.d/domain.tld.conf
     <VirtualHost *:80>
         ServerName domain.tld
         ServerAlias www.domain.tld
@@ -70,21 +73,13 @@ requests to PHP-FPM. Configure PHP-FPM to listen on a TCP or Unix socket, enable
         #
         # SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
 
-        # For Apache 2.4.9 or higher
-        # Using SetHandler avoids issues with using ProxyPassMatch in combination
-        # with mod_rewrite or mod_autoindex
         <FilesMatch \.php$>
-            SetHandler proxy:fcgi://127.0.0.1:9000
-            # for Unix sockets, Apache 2.4.10 or higher
-            # SetHandler proxy:unix:/path/to/fpm.sock|fcgi://dummy
-        </FilesMatch>
+            # when using PHP-FPM as a unix socket
+            SetHandler proxy:unix:/var/run/php/php7.4-fpm.sock|fcgi://dummy
 
-        # If you use Apache version below 2.4.9 you must consider update or use this instead
-        # ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/var/www/project/public/$1
-
-        # If you run your Symfony application on a subpath of your document root, the
-        # regular expression must be changed accordingly:
-        # ProxyPassMatch ^/path-to-app/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/var/www/project/public/$1
+            # when PHP-FPM is configured to use TCP
+            # SetHandler proxy:fcgi://127.0.0.1:9000
+        </FilesMatch>
 
         DocumentRoot /var/www/project/public
         <Directory /var/www/project/public>
@@ -110,6 +105,7 @@ The **minimum configuration** to get your application running under Nginx is:
 
 .. code-block:: nginx
 
+    # /etc/nginx/conf.d/domain.tld.conf
     server {
         server_name domain.tld www.domain.tld;
         root /var/www/project/public;
@@ -127,7 +123,12 @@ The **minimum configuration** to get your application running under Nginx is:
         # }
 
         location ~ ^/index\.php(/|$) {
+            # when using PHP-FPM as a unix socket
             fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
+
+            # when PHP-FPM is configured to use TCP
+            fastcgi_pass 127.0.0.1:9000;
+
             fastcgi_split_path_info ^(.+\.php)(/.*)$;
             include fastcgi_params;
 
@@ -169,11 +170,6 @@ The **minimum configuration** to get your application running under Nginx is:
     If you use NGINX Unit, check out the official article about
     `How to run Symfony applications using NGINX Unit`_.
 
-.. note::
-
-    Depending on your PHP-FPM config, the ``fastcgi_pass`` can also be
-    ``fastcgi_pass 127.0.0.1:9000``.
-
 .. tip::
 
     This executes **only** ``index.php`` in the public directory. All other files