typo

defaults/main.yml

@@ -10,8 +10,6 @@ php_pm: static
 php_pm_max_children: 100
 php_pm_max_requests: 10000
 php_pm_status_url: /phpstatus
-php_packages: 
-- 'php{{ php_version_nodot }}-php-common'
 php_min_spare_servers: 5
 php_max_spare_servers: 35
 php_use_phpmyadmin: false

tasks/php-fpm.yml

@@ -18,38 +18,53 @@
 
 - name: "setup  repository - debian"
   block:
-    - name: setup repo key
+  - name: Check if my_package is installed
-      ansible.builtin.get_url:
+    command: dpkg-query -W debsuryorg-archive-keyring
-        url: https://packages.sury.org/php/apt.gpg
+    register: my_package_check_deb
-        dest: /etc/apt/keyrings/sury_php.gpg
+    failed_when: my_package_check_deb.rc > 1
+    changed_when: my_package_check_deb.rc == 1
+    
+  - name: setup repo key
+    ansible.builtin.get_url:
+      url: https://packages.sury.org/debsuryorg-archive-keyring.deb
+      dest: /tmp/debsuryorg-archive-keyring.deb
+    when: my_package_check_deb.rc==1
 
-    - name: setup source list
+  - name: install key
-      ansible.builtin.template:
+    ansible.builtin.apt:
+      state: present
+      deb: /tmp/debsuryorg-archive-keyring.deb
+    when: my_package_check_deb.rc==1
+
+
+  - name: setup source list
+    ansible.builtin.template:
         src: php_sury_sources.list
         dest: /etc/apt/sources.list.d/php_sury.sources.list
-      register: repo_setup
+    register: repo_setup
 
-    - name: update cache
+  - name: update cache
-      ansible.builtin.apt:
+    ansible.builtin.apt:
         update_cache: true
-      when: repo_setup.changed
+    when: repo_setup.changed
   when: ansible_os_family | lower == 'debian'
 
 - name: create socket directory if needed
-  file:
+  ansible.builtin.file:
     path: "{{ php_fpm_listen_socket|dirname }}"
     state: directory
     owner: "{{ php_fpm_pool_user }}"
 
 - name: install php-fpm
   ansible.builtin.package:
-    name: '{{ php_fpm_package }}'
+    name: '{{ php_fpm_packages}}'
     state: present
 
 - name: install php packages
   ansible.builtin.package:
     name: "{{ php_packages }}"
     state: present
+  when: php_packages is defined
 
 - name: disable default pool
   copy:
@@ -85,4 +100,4 @@
 - name: configure logrotate
   template:
     src: logrotate.conf.jj
-    dest: "/etc/logrotate.d/php-fpm_{{ php_pool_name }}_{{ php_fpm_pool_user }}.conf"
+    dest: "/etc/logrotate.d/php-fpm-{{php_version }}.conf"

templates/logrotate.conf.jj

@@ -1,12 +1,17 @@
-/var/opt/remi/php{{ php_version_nodot }}/log/php-fpm/*log {
+#{{ ansible_managed }}
+{{ php_fpm_log_dir }}/php_fpm*{{ php_version_nodot }}*.log {
    daily
    rotate 15
    missingok
    notifempty
    sharedscripts
-   postrotate
+	postrotate
-      /bin/systemctl reload php{{ php_version_nodot }}-php-fpm
+		if [ -x /usr/lib/php/php{{ php_version }}-fpm-reopenlogs ]; then
-   endscript
+			/usr/lib/php/php{{ php_version }}-fpm-reopenlogs;
+      else
+         /bin/systemctl reload  {{ php_service_name }}
+		fi
+	endscript
 }
 
 

templates/php_apache_config.conf.jj

@@ -1,3 +1,4 @@
+"{{ ansible_managed }}"
 <FilesMatch \.php$>
    SetHandler  "proxy:unix:{{ php_fpm_listen_socket }}|fcgi://localhost/"
 </FilesMatch>

templates/php_sury_sources.list

@@ -1 +1,2 @@
-deb [signed-by=/etc/apt/keyrings/sury_php.gpg] https://packages.sury.org/php/ {{ ansible_distribution_release }} main
+#{{ ansible_managed }}
+deb [signed-by=/etc/apt/trusted.gpg.d/debsuryorg-archive.gpg] https://packages.sury.org/php/ {{ ansible_distribution_release }} main

templates/www.conf

@@ -1,4 +1,5 @@
-[{{ php_pool_name }}_{{ php_version }}]
+;{{ ansible_managed }}
+[{{ php_pool_name }}]
 user = {{ php_fpm_pool_user }}
 group = {{ php_fpm_pool_group }}
 listen = {{ php_fpm_listen_socket }}
@@ -15,9 +16,9 @@ pm.max_requests = {{ php_pm_max_requests }}
 pm.status_path = {{ php_pm_status_url }}
 ping.path = /ping
 access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
-access.log = {{ php_fpm_log_dir }}$pool.access.log
+access.log = {{ php_fpm_log_dir }}php_fpm_$pool.access.log
-slowlog = {{ php_fpm_log_dir }}$pool.slow.log
+slowlog = {{ php_fpm_log_dir }}php_fpm_$pool.slow.log
 request_slowlog_timeout = 5s
 php_value[session.save_handler] = files
-php_value[session.save_path]    = {{ php_fpm_lib_dir }}/session
+php_value[session.save_path]    = {{ php_fpm_lib_dir }}/sessions
 php_value[soap.wsdl_cache_dir]  = {{ php_fpm_lib_dir }}/wsdlcache

vars/debian.yml

@@ -5,4 +5,6 @@ php_service_name: php{{ php_version }}-fpm
 php_fpm_lib_dir: /var/lib/php/
 apache_user: www-data
 apache_group: www-data
-php_fpm_package: "php{{ php_version }}-fpm"
+php_fpm_packages:
+- "php{{ php_version }}-fpm"
+- "php{{ php_version }}-common"

vars/redhat.yml

@@ -6,4 +6,6 @@ php_fpm_log_dir: "/var/opt/remi/php{{ php_version_nodot }}/log/php-fpm/"
 php_fpm_lib_dir: "/var/opt/remi/php{{ php_version_nodot }}/lib/php/"
 apache_user: apache
 apache_group: apache
-php_fpm_package: "php{{ php_version_nodot }}-php-fpm"
+php_fpm_packages:
+- "php{{ php_version_nodot }}-php-fpm"
+- "php{{ php_version_nodot }}-php-common"