Merge remote-tracking branch 'github/pull/829'

author Tom Hughes <tom@compton.nu>

Sat, 7 Mar 2026 12:46:38 +0000 (12:46 +0000)

committer Tom Hughes <tom@compton.nu>

Sat, 7 Mar 2026 12:46:38 +0000 (12:46 +0000)
author Tom Hughes <tom@compton.nu>
Sat, 7 Mar 2026 12:46:38 +0000 (12:46 +0000)
committer Tom Hughes <tom@compton.nu>
Sat, 7 Mar 2026 12:46:38 +0000 (12:46 +0000)
diff --cc cookbooks/web/templates/default/apache.frontend.erb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sat, 7 Mar 2026 12:46:38 +0000 (12:46 +0000)
committer	Tom Hughes <tom@compton.nu>
	Sat, 7 Mar 2026 12:46:38 +0000 (12:46 +0000)