Minor docs improvements.

Author: gregharvey

roles/_meta/webserver/meta/main.yml

@@ -8,4 +8,5 @@ dependencies:
   - role: debian/nodejs
   - role: debian/php-cli
   - role: debian/php-fpm
+  - role: debian/php_composer
   - role: debian/nginx

roles/debian/nginx/templates/vhost_letsencrypt.j2

@@ -9,10 +9,10 @@ server {
     server_name {{ domain.server_name }};
     error_log {{ domain.error_log }} {{ domain.error_log_level }};
     access_log {{ domain.access_log }} {{ domain.access_log_format | default('main') }};
-    # Proxy for certbot (LetsEncrypt)
     {% if domain.ssl.web_server | default('standalone') == 'standalone' %}
-        location /.well-known/acme-challenge/ {
-            proxy_pass http://127.0.0.1:{{ domain.ssl.http_01_port }}$request_uri;
-        }
+    # Proxy for certbot (LetsEncrypt)
+    location /.well-known/acme-challenge/ {
+        proxy_pass http://127.0.0.1:{{ domain.ssl.http_01_port }}$request_uri;
+    }
     {% endif %}
 }

roles/debian/php-fpm/README.md

@@ -2,6 +2,8 @@
 
 Installs and configures the PHP-FPM flavour of FastCGI.
 
+Note, for legacy reasons this role sets up PHP-FPM to use TCP/IP instead of a Unix socket by default. However, we *recommend* you change this by setting `unix_socket: true` unless you really need to run PHP-FPM over TCP/IP, as a Unix socket is much faster. If you do, be sure to set the `pool_group` variable to match your web server user, or the web server will be unable to interact with PHP.
+
 <!--TOC-->
 <!--ENDTOC-->
 
@@ -23,7 +25,7 @@ php:
     # It is important to scale up processes on bigger servers, so that more
     # requests can be handled. Double the number of vCPUs is a good default.
     # Can be between 5 and 64.
-    max_children: "{{ [5, [(ansible_facts.ansible_processor_nproc | default(1)) * 2, 64] | min] | max }}" # Fallback in case ansible_processor_nproc is not gathered before tasks
+    max_children: "{{ [10, [(ansible_facts.ansible_processor_nproc | default(1)) * 2, 64] | min] | max }}" # Fallback in case ansible_processor_nproc is not gathered before tasks
     start_servers: 2
     min_spare_servers: 1
     max_spare_servers: 3

roles/debian/php-fpm/defaults/main.yml

@@ -6,8 +6,8 @@ php:
     unix_socket: false  # set to true to use a unix socket, you must also update nginx and cachetool if you do
     server_ip: "127.0.0.1"
     tcp_port: ""  # leave empty to automate port selection - port will be "90{{ version | replace('.','') }}" - e.g. 9081 for PHP 8.1
-    pool_user: "{{ user_deploy.username }}"
-    pool_group: "{{ user_deploy.username }}"  # if using unix socket this should be the web server user
+    pool_user: "{{ user_deploy.username }}"   # this should always be the deploy user, usually deploy
+    pool_group: "{{ user_deploy.username }}"  # if using unix socket this should be the web server user, often www-data
     pm: dynamic # can also be static, see https://tideways.com/profiler/blog/an-introduction-to-php-fpm-tuning
     default_socket_timeout: 60
     # It is important to scale up processes on bigger servers, so that more