From dc459b3985422aaa9313ea9a603c48967c15a444 Mon Sep 17 00:00:00 2001
From: SebClem <seb6596@gmail.com>
Date: Fri, 21 Jul 2023 14:19:33 +0200
Subject: [PATCH] Install php8.1

---
 tasks/install-deps.yml     | 22 ++++++++++++++++++++++
 templates/dolibarr.conf.j2 |  4 +++-
 vars/main.yml              | 32 ++++++++++++++++----------------
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/tasks/install-deps.yml b/tasks/install-deps.yml
index 41b950b..90a43e5 100644
--- a/tasks/install-deps.yml
+++ b/tasks/install-deps.yml
@@ -1,3 +1,25 @@
+- name: Install deps for php repo
+  ansible.builtin.apt:
+    name:
+      - ca-certificates
+      - curl
+
+- name: Save repo key
+  ansible.builtin.get_url:
+    url: https://packages.sury.org/php/apt.gpg
+    dest: /usr/share/keyrings/deb.sury.org-php.gpg
+    mode: "644"
+
+- name: Add repo
+  ansible.builtin.template:
+    src: php.list.j2
+    dest: /etc/apt/sources.list.d/php.list
+    mode: "644"
+
+- name: Apt update
+  ansible.builtin.apt:
+    update_cache: true
+
 - name: "Install php deps"
   ansible.builtin.apt:
     name: "{{ dolibarr_php_dependencies }}"
diff --git a/templates/dolibarr.conf.j2 b/templates/dolibarr.conf.j2
index d82676c..8611199 100644
--- a/templates/dolibarr.conf.j2
+++ b/templates/dolibarr.conf.j2
@@ -2,7 +2,9 @@
     DocumentRoot {{ dolibarr_install_dir }}/htdocs
 
     <Directory {{ dolibarr_install_dir }}/htdocs>
-    AllowOverride All
+        AllowOverride All
+        Options Indexes FollowSymLinks
+        Require all granted
     </Directory>
 
     ErrorLog ${APACHE_LOG_DIR}/error.lo
diff --git a/vars/main.yml b/vars/main.yml
index bb0fc7a..d97b753 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,24 +1,24 @@
 ---
 # vars file for Ansible-Dolibarr-Role
-dolibarr_php_dependencies:
-  - php
-  - php-cli
-  - php-mysql
-  - php-common
-  - php-zip
-  - php-mbstring
-  - php-xmlrpc
-  - php-curl
-  - php-soap
-  - php-gd
-  - php-xml
-  - php-intl
-  - php-ldap
-  - php-imap
+dolibarr_php8.1_dependencies:
+  - php8.1
+  - php8.1-cli
+  - php8.1-mysql
+  - php8.1-common
+  - php8.1-zip
+  - php8.1-mbstring
+  - php8.1-xmlrpc
+  - php8.1-curl
+  - php8.1-soap
+  - php8.1-gd
+  - php8.1-xml
+  - php8.1-intl
+  - php8.1-ldap
+  - php8.1-imap
 
 dolibarr_apache_dependencies:
   - apache2
-  - libapache2-mod-php
+  - libapache2-mod-php8.1
 
 dolibarr_dowload_url: https://github.com/Dolibarr/dolibarr/archive/refs/tags/{{ dolibarr_version }}.tar.gz