Opcache vars pr 1.x

roles/nginx/defaults/main.yml

@@ -22,10 +22,9 @@ nginx:
   # Group prefix. Useful for grouping by environments.
   log_group_prefix: ""
   # Main log stream for nginx (Cloudwatch).
-  log_stream_name: example
-  # We can only have one backend, due to the way we use "common" templates.
-  # Moving this per domain means instead having templates per project type.
-  php_fastcgi_backend: "127.0.0.1:90{{ php.version[-1] | replace('.','') }}"
+  log_stream_name: example # We can only have one backend, due to the way we use "common" templates, moving this per domain means instead having templates per project type.
+  # See php.fpm.unix_socket, if true use a socket here:
+  php_fastcgi_backend: "127.0.0.1:90{{ php.version[-1] | replace('.','') }}" # for unix socket use "unix:/var/run/php{{ php.version[-1] | replace('.','') }}-fpm.sock"
   ratelimitingcrawlers: false
   client_max_body_size: "700M"
   fastcgi_read_timeout: 60

roles/php-fpm/defaults/main.yml

@@ -1,6 +1,9 @@
 ---
 php:
+  # see php-common for default version
   fpm:
+    unix_socket: false # set to true to use a unix socket, you must also update nginx and cachetool if you do
+    tcp_port: "" # leave empty to automate port selection - port will be "90{{ version | replace('.','') }}" - e.g. 9081 for PHP 8.1
     expose_php: "{% if _env_type == 'prod' %}Off{% else %}On{% endif %}"
     error_reporting: "{% if _env_type == 'prod' %}E_ALL & ~E_DEPRECATED & ~E_STRICT{% else %}E_ALL{% endif %}"
     display_errors: "{% if _env_type == 'prod' %}Off{% else %}On{% endif %}"
@@ -21,7 +24,7 @@ php:
     max_file_uploads: 20
     date_timezone: "Europe/London"
     pool_user: "{{ user_deploy.username }}"
-    pool_group: "{{ user_deploy.username }}"
+    pool_group: "{{ user_deploy.username }}" # if using unix socket this should be the web server user
     default_socket_timeout: 60
     max_children: 5
     start_servers: 2

roles/php-fpm/tasks/main.yml

@@ -16,12 +16,20 @@
   loop_control:
     loop_var: version
 
-- name: Copy default pool configuration.
+- name: Copy default pool configuration for a single, fixed port PHP version.
+  ansible.builtin.template:
+    dest: "/etc/php/{{ php.version[0] }}/fpm/pool.d/www.conf"
+    src: "www.conf-fixedport.j2"
+    mode: 0555
+  when: php.fpm.tcp_port | length > 0
+
+- name: Copy default pool configuration for dynamic PHP versioning.
   ansible.builtin.template:
     dest: "/etc/php/{{ version }}/fpm/pool.d/www.conf"
     src: "www.conf.j2"
     mode: 0555
   with_items: "{{ php.version }}"
+  when: php.fpm.tcp_port | length == 0
   loop_control:
     loop_var: version
 

roles/php-fpm/templates/www.conf-fixedport.j2

@@ -0,0 +1,13 @@
+[www]
+user = {{ php.fpm.pool_user }}
+group = {{ php.fpm.pool_group }}
+listen = 127.0.0.1:{{ php.fpm.tcp_port }}
+listen.owner = {{ php.fpm.pool_user }}
+listen.group = {{ php.fpm.pool_group }}
+pm = dynamic
+pm.max_children = {{ php.fpm.max_children }}
+pm.start_servers = {{ php.fpm.start_servers }}
+pm.min_spare_servers = {{ php.fpm.min_spare_servers }}
+pm.max_spare_servers = {{ php.fpm.max_spare_servers }}
+pm.process_idle_timeout = {{ php.fpm.process_idle_timeout }}
+pm.max_requests = {{ php.fpm.max_requests }}

roles/php-fpm/templates/www.conf.j2

@@ -1,7 +1,8 @@
 [www]
 user = {{ php.fpm.pool_user }}
 group = {{ php.fpm.pool_group }}
-listen = 127.0.0.1:90{{ version | replace('.','') }}
+listen = {% if php.fpm.unix_socket %}'/var/run/php{{ version | replace('.','') }}-fpm.sock'{% else %}127.0.0.1:90{{ version | replace('.','') }}{% endif %}
+
 listen.owner = {{ php.fpm.pool_user }}
 listen.group = {{ php.fpm.pool_group }}
 pm = dynamic
@@ -10,4 +11,4 @@ pm.start_servers = {{ php.fpm.start_servers }}
 pm.min_spare_servers = {{ php.fpm.min_spare_servers }}
 pm.max_spare_servers = {{ php.fpm.max_spare_servers }}
 pm.process_idle_timeout = {{ php.fpm.process_idle_timeout }}
-pm.max_requests = {{ php.fpm.max_requests }}
+pm.max_requests = {{ php.fpm.max_requests }}