From 4cd8eb177535efc0ddf711a855ac0d221103b313 Mon Sep 17 00:00:00 2001
From: phil <phil@systemausfall.org>
Date: Fri, 17 Mar 2023 21:55:48 +0100
Subject: [PATCH] Fix lint warnings

---
 defaults/main.yml |  2 ++
 tasks/php.yml     | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 11adcb6..162f1d4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,3 +6,5 @@ php_fpm_pool_config_file: "{{ php_fpm_pool_dir }}/%i.cfg"
 php_fpm_cpu_quota: "100%"
 php_fpm_memory_high: "25%"
 php_fpm_memory_max: "35%"
+
+apache_php_module_name: "libapache2-mod-php{{ php_version.stdout }}"
diff --git a/tasks/php.yml b/tasks/php.yml
index 19f51fe..b5f0a71 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -3,20 +3,20 @@
   ansible.builtin.template:
     src: php.ini
     dest: "/etc/php/{{ php_version.stdout }}/mods-available/{{ inventory_hostname }}.ini"
-    mode: 0644
+    mode: "0644"
 
 - name: "PHP | Copy custom PHP-FPM configuration"
   ansible.builtin.template:
     src: php-fpm.ini
     dest: "/etc/php/{{ php_version.stdout }}/mods-available/{{ inventory_hostname }}-fpm.ini"
-    mode: 0644
+    mode: "0644"
 
 - name: "PHP | Enable PHP configuration for mod_php"
   ansible.builtin.file:
     src: "/etc/php/{{ php_version.stdout }}/mods-available/{{ inventory_hostname }}.ini"
     dest: "/etc/php/{{ php_version.stdout }}/apache2/conf.d/30-{{ inventory_hostname }}.ini"
     state: link
-  when: "'libapache2-mod-php{{ php_version.stdout }}' in ansible_facts.packages"
+  when: "'apache_php_module_name' in ansible_facts.packages"
   notify: reload apache2
 
 - name: "PHP | Enable PHP cli configuration"
@@ -29,9 +29,9 @@
   ansible.builtin.file:
     path: "{{ php_fpm_log_dir }}"
     state: directory
-    mode: 0755
+    mode: "0755"
 
-- name: "PHP | Enable PGP FPM configuration"
+- name: "PHP | Enable PHP FPM configuration"
   ansible.builtin.file:
     src: "/etc/php/{{ php_version.stdout }}/mods-available/{{ inventory_hostname }}-fpm.ini"
     dest: "/etc/php/{{ php_version.stdout }}/fpm/conf.d/30-{{ inventory_hostname }}-fpm.ini"
@@ -43,7 +43,7 @@
   ansible.builtin.template:
     src: "systemd/{{ item }}"
     dest: "/etc/systemd/system/{{ item }}"
-    mode: 0644
+    mode: "0644"
   loop:
     - php-fpm@.service
     - php-fpm@.socket
@@ -56,4 +56,4 @@
   ansible.builtin.file:
     path: /etc/systemd/system/php-fpm@.service.d
     state: directory
-    mode: 0755
+    mode: "0755"