From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 8 May 2024 20:10:55 +0000 (-0600)
Subject: Assume Debian 12 (PHP 8.2) is in use on the Nextcloud server.
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3f532c3e55f184ab2307838c3d0d84ee80c159b9;p=Institute

Assume Debian 12 (PHP 8.2) is in use on the Nextcloud server.
---

diff --git a/README.org b/README.org
index 9280c88..b19a5d8 100644
--- a/README.org
+++ b/README.org
@@ -4330,22 +4330,11 @@ performance, as recommended by Nextcloud.
 #+BEGIN_SRC conf :tangle roles_t/core/tasks/main.yml
 
 - name: Set PHP memory_limit for Nextcloud.
-  become: yes
-  lineinfile:
-    path: /etc/php/7.4/apache2/php.ini
-    regexp: memory_limit *=
-    line: memory_limit = 512M
-  when: ansible_distribution != 'Debian'
-        or 12 > ansible_distribution_major_version|int
-
-- name: Set PHP memory_limit for Nextcloud (Debian 12).
   become: yes
   lineinfile:
     path: /etc/php/8.2/apache2/php.ini
     regexp: memory_limit *=
     line: memory_limit = 512M
-  when: ansible_distribution == 'Debian'
-        and 11 < ansible_distribution_major_version|int
 
 - name: Include PHP parameters for Nextcloud.
   become: yes
@@ -4360,7 +4349,7 @@ performance, as recommended by Nextcloud.
       opcache.memory_consumption=128
       opcache.save_comments=1
       opcache.revalidate_freq=1
-    dest: /etc/php/7.4/mods-available/nextcloud.ini
+    dest: /etc/php/8.2/mods-available/nextcloud.ini
   notify: Restart Apache2.
 
 - name: Enable Nextcloud PHP modules.
diff --git a/roles_t/core/tasks/main.yml b/roles_t/core/tasks/main.yml
index 4811a2a..5a8d0bf 100644
--- a/roles_t/core/tasks/main.yml
+++ b/roles_t/core/tasks/main.yml
@@ -764,22 +764,11 @@
     follow: no
 
 - name: Set PHP memory_limit for Nextcloud.
-  become: yes
-  lineinfile:
-    path: /etc/php/7.4/apache2/php.ini
-    regexp: memory_limit *=
-    line: memory_limit = 512M
-  when: ansible_distribution != 'Debian'
-        or 12 > ansible_distribution_major_version|int
-
-- name: Set PHP memory_limit for Nextcloud (Debian 12).
   become: yes
   lineinfile:
     path: /etc/php/8.2/apache2/php.ini
     regexp: memory_limit *=
     line: memory_limit = 512M
-  when: ansible_distribution == 'Debian'
-        and 11 < ansible_distribution_major_version|int
 
 - name: Include PHP parameters for Nextcloud.
   become: yes
@@ -794,7 +783,7 @@
       opcache.memory_consumption=128
       opcache.save_comments=1
       opcache.revalidate_freq=1
-    dest: /etc/php/7.4/mods-available/nextcloud.ini
+    dest: /etc/php/8.2/mods-available/nextcloud.ini
   notify: Restart Apache2.
 
 - name: Enable Nextcloud PHP modules.