From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sat, 20 Jun 2026 21:10:07 +0000 (-0600)
Subject: Fixes to accommodate Debian 13 on Core (PHP 8.4, BIND9).
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=aa7b04c4d002c39e3811beec3070ef97f8f3cc0d;p=Institute

Fixes to accommodate Debian 13 on Core (PHP 8.4, BIND9).
---

diff --git a/README.org b/README.org
index 291d7b9..1753c46 100644
--- a/README.org
+++ b/README.org
@@ -2820,7 +2820,7 @@ options {
 	allow-recursion { trusted; };
 	allow-query-cache { trusted; };
 
-	dnssec-validation yes;
+	dnssec-validation auto;
 
 	listen-on {
 		{{ core_addr }};
@@ -2832,8 +2832,6 @@ options {
 #+NAME: bind-local
 #+CAPTION: ~bind-local~
 #+BEGIN_SRC conf
-include "/etc/bind/zones.rfc1918";
-
 zone "{{ domain_priv }}." {
 	type master;
 	file "/etc/bind/db.domain";
@@ -4466,7 +4464,7 @@ performance, as recommended by Nextcloud.
 - name: Set PHP memory_limit for Nextcloud.
   become: yes
   lineinfile:
-    path: /etc/php/8.2/apache2/php.ini
+    path: /etc/php/8.4/apache2/php.ini
     regexp: "memory_limit *="
     line: "memory_limit = 768M"
 
@@ -4483,14 +4481,14 @@ performance, as recommended by Nextcloud.
       opcache.memory_consumption=128
       opcache.save_comments=1
       opcache.revalidate_freq=1
-    dest: /etc/php/8.2/mods-available/nextcloud.ini
+    dest: /etc/php/8.4/mods-available/nextcloud.ini
   notify: Restart Apache2.
 
 - name: Enable Nextcloud PHP modules.
   become: yes
   command:
     cmd: phpenmod {{ item }}
-    creates: /etc/php/8.2/apache2/conf.d/20-{{ item }}.ini
+    creates: /etc/php/8.4/apache2/conf.d/20-{{ item }}.ini
   loop: [ nextcloud, apcu ]
   notify: Restart Apache2.
 #+END_SRC
diff --git a/roles_t/core/tasks/main.yml b/roles_t/core/tasks/main.yml
index 952b651..b955426 100644
--- a/roles_t/core/tasks/main.yml
+++ b/roles_t/core/tasks/main.yml
@@ -124,7 +124,7 @@
       	allow-recursion { trusted; };
       	allow-query-cache { trusted; };
       
-      	dnssec-validation yes;
+      	dnssec-validation auto;
       
       	listen-on {
       		{{ core_addr }};
@@ -138,8 +138,6 @@
   become: yes
   copy:
     content: |
-      include "/etc/bind/zones.rfc1918";
-      
       zone "{{ domain_priv }}." {
       	type master;
       	file "/etc/bind/db.domain";
@@ -821,7 +819,7 @@
 - name: Set PHP memory_limit for Nextcloud.
   become: yes
   lineinfile:
-    path: /etc/php/8.2/apache2/php.ini
+    path: /etc/php/8.4/apache2/php.ini
     regexp: "memory_limit *="
     line: "memory_limit = 768M"
 
@@ -838,14 +836,14 @@
       opcache.memory_consumption=128
       opcache.save_comments=1
       opcache.revalidate_freq=1
-    dest: /etc/php/8.2/mods-available/nextcloud.ini
+    dest: /etc/php/8.4/mods-available/nextcloud.ini
   notify: Restart Apache2.
 
 - name: Enable Nextcloud PHP modules.
   become: yes
   command:
     cmd: phpenmod {{ item }}
-    creates: /etc/php/8.2/apache2/conf.d/20-{{ item }}.ini
+    creates: /etc/php/8.4/apache2/conf.d/20-{{ item }}.ini
   loop: [ nextcloud, apcu ]
   notify: Restart Apache2.