From f8f5bec8b5f672ee09d134b41d3cea583c6c9793 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sun, 19 Mar 2023 11:52:09 +0100
Subject: [PATCH] lxc-php: prepare php82

---
 lxc-php/defaults/main.yml |  2 ++
 lxc-php/tasks/main.yml    | 23 +++++++++++++----------
 lxc-php/tasks/php82.yml   | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 lxc-php/tasks/php82.yml

diff --git a/lxc-php/defaults/main.yml b/lxc-php/defaults/main.yml
index 9b501b6c..d27f60f2 100644
--- a/lxc-php/defaults/main.yml
+++ b/lxc-php/defaults/main.yml
@@ -21,6 +21,7 @@ lxc_php_container_releases:
   php74: "bullseye"
   php80: "bullseye"
   php81: "bullseye"
+  # php82: "bookworm"
 
 lxc_php_services:
   php56: 'php5-fpm.service'
@@ -29,5 +30,6 @@ lxc_php_services:
   php74: 'php7.4-fpm.service'
   php80: 'php8.0-fpm.service'
   php81: 'php8.1-fpm.service'
+  # php82: 'php8.2-fpm.service'
 
 apt_keyring_dir: "{{ ansible_distribution_major_version is version('12', '<') | ternary('/etc/apt/trusted.gpg.d', '/etc/apt/keyrings') }}"
\ No newline at end of file
diff --git a/lxc-php/tasks/main.yml b/lxc-php/tasks/main.yml
index bd2ae182..a1e91431 100644
--- a/lxc-php/tasks/main.yml
+++ b/lxc-php/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: "Ensure that lxc_php_version is defined"
-  fail:
+  ansible.builtin.fail:
     msg: Please configure var lxc_php_version
   when: lxc_php_version is none
 
@@ -17,28 +17,31 @@
     lxc_rootfs: "/var/lib/lxc/{{ lxc_php_version }}/rootfs"
 
 - name: "Update APT cache in container {{ lxc_php_version }}"
-  lxc_container:
+  community.general.lxc_container:
     name: "{{ lxc_php_version }}"
     container_command: "apt-get update"
 
-- include: "php56.yml"
+- ansible.builtin.import_tasks: "php56.yml"
   when: lxc_php_version == "php56"
 
-- include: "php70.yml"
+- ansible.builtin.import_tasks: "php70.yml"
   when: lxc_php_version == "php70"
 
-- include: "php73.yml"
+- ansible.builtin.import_tasks: "php73.yml"
   when: lxc_php_version == "php73"
 
-- include: "php74.yml"
+- ansible.builtin.import_tasks: "php74.yml"
   when: lxc_php_version == "php74"
 
-- include: "php80.yml"
+- ansible.builtin.import_tasks: "php80.yml"
   when: lxc_php_version == "php80"
 
-- include: "php81.yml"
+- ansible.builtin.import_tasks: "php81.yml"
   when: lxc_php_version == "php81"
 
-- include: "umask.yml"
+# - ansible.builtin.import_tasks: "php82.yml"
+#   when: lxc_php_version == "php82"
 
-- include: "misc.yml"
+- ansible.builtin.import_tasks: "umask.yml"
+
+- ansible.builtin.import_tasks: "misc.yml"
diff --git a/lxc-php/tasks/php82.yml b/lxc-php/tasks/php82.yml
new file mode 100644
index 00000000..8ecb1e33
--- /dev/null
+++ b/lxc-php/tasks/php82.yml
@@ -0,0 +1,32 @@
+---
+
+- name: set APT keyring
+  ansible.builtin.set_fact:
+    lxc_apt_keyring_dir: /etc/apt/keyrings
+
+- name: "{{ lxc_php_version }} - Install PHP packages"
+  lxc_container:
+    name: "{{ lxc_php_version }}"
+    container_command: "DEBIAN_FRONTEND=noninteractive apt install -y php-fpm php-cli php-gd php-intl php-imap php-ldap php-mysql php-pgsql php-sqlite3 php-curl php-zip php-mbstring php-xml php-zip composer libphp-phpmailer"
+
+# TODO : adapt to Bookworm and deb822 format
+
+- name: "{{ lxc_php_version }} - fix bookworm repository"
+  replace:
+    dest: "{{ lxc_rootfs }}/etc/apt/sources.list"
+    regexp: 'bullseye/updates'
+    replace: 'bullseye-security'
+
+- name: "{{ lxc_php_version }} - Copy evolinux PHP configuration"
+  template:
+    src: z-evolinux-defaults.ini.j2
+    dest: "{{ line_item }}"
+    mode: "0644"
+  notify: "Reload {{ lxc_php_version }}-fpm"
+  loop:
+    - "{{ lxc_rootfs }}/etc/php/8.2/fpm/conf.d/z-evolinux-defaults.ini"
+    - "{{ lxc_rootfs }}/etc/php/8.2/cli/conf.d/z-evolinux-defaults.ini"
+  loop_control:
+    loop_var: line_item
+
+- include: "mail_opensmtpd.yml"