From 5277c6a2da73a46a7bb38c68a93c2032c94506ca Mon Sep 17 00:00:00 2001 From: Thomas Constans Date: Tue, 13 Feb 2024 14:28:40 +0100 Subject: [PATCH] remove version from php pool name --- README.md | 4 ++-- defaults/main.yml | 4 ++-- tasks/php-fpm.yml | 2 +- templates/www.conf | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0a8ac93..ba02697 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ None Role Variables -------------- -php_poolname: default www (version will be appended) -php_version: default 81 +php_poolname: default www_{{ php_version }} +php_version: default 82 php_fpm_pool_user: default apache php_fpm_pool_group: default apache php_fpm_listen_url: default 127.0.0.1:90{{ php_version }} diff --git a/defaults/main.yml b/defaults/main.yml index ae5d4d6..10642f0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for php-fpm -php_poolname: www -php_version: 81 +php_version: 82 +php_poolname: "www_{{ php_version }}" php_fpm_pool_user: apache php_fpm_pool_group: apache php_fpm_listen_url: 127.0.0.1:90{{ php_version }} diff --git a/tasks/php-fpm.yml b/tasks/php-fpm.yml index 3383dbe..221b36b 100644 --- a/tasks/php-fpm.yml +++ b/tasks/php-fpm.yml @@ -39,7 +39,7 @@ - name: configure php-fpm pool 2 template: src: www.conf - dest: /etc/opt/remi/php{{ php_version }}/php-fpm.d/{{ php_poolname }}_{{ php_version }}.conf + dest: /etc/opt/remi/php{{ php_version }}/php-fpm.d/{{ php_poolname }}.conf notify: restart php-fpm - name: start and enable service diff --git a/templates/www.conf b/templates/www.conf index 5dcec68..e3e6778 100644 --- a/templates/www.conf +++ b/templates/www.conf @@ -1,4 +1,4 @@ -[{{ php_poolname}}_{{ php_version }}] +[{{ php_poolname }}] user = {{ php_fpm_pool_user }} group = {{ php_fpm_pool_group }} listen = {{ php_fpm_listen_url }}