From 2ed47b047d2323520709dfdbc2ecff9279aaab0e Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Wed, 4 Mar 2020 16:36:54 -0800
Subject: [PATCH] apache: Handle transition to php 7.4

Directory /etc/php/7.4 became available before php7.4-fpm became available.
Handle this by checking the run time socket of the fpm daemon instead of the
directory.

Discussed and tested in
https://discuss.freedombox.org/t/mediawiki-service-unavailable/711/23

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../conf-available/php-fpm-freedombox.conf    | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/plinth/modules/apache/data/etc/apache2/conf-available/php-fpm-freedombox.conf b/plinth/modules/apache/data/etc/apache2/conf-available/php-fpm-freedombox.conf
index 80c6ca636..bbc4685cd 100644
--- a/plinth/modules/apache/data/etc/apache2/conf-available/php-fpm-freedombox.conf
+++ b/plinth/modules/apache/data/etc/apache2/conf-available/php-fpm-freedombox.conf
@@ -14,30 +14,18 @@
     </IfModule>
 
     <FilesMatch ".+\.ph(ar|p|tml)$">
-        <IfFile /etc/php/7.3>
-            SetHandler "proxy:unix:/run/php/php7.3-fpm.sock|fcgi://localhost"
-        </IfFile>
-        <IfFile /etc/php/7.4>
+        <If "-e '/run/php/php-fpm.sock'">
+            SetHandler "proxy:unix:/run/php/php-fpm.sock|fcgi://localhost"
+        </If>
+        <ElseIf "-e '/run/php/php7.4-fpm.sock'">
             SetHandler "proxy:unix:/run/php/php7.4-fpm.sock|fcgi://localhost"
-        </IfFile>
-        <IfFile /etc/php/7.5>
-            SetHandler "proxy:unix:/run/php/php7.5-fpm.sock|fcgi://localhost"
-        </IfFile>
-        <IfFile /etc/php/7.6>
-            SetHandler "proxy:unix:/run/php/php7.6-fpm.sock|fcgi://localhost"
-        </IfFile>
-        <IfFile /etc/php/8.0>
-            SetHandler "proxy:unix:/run/php/php8.0-fpm.sock|fcgi://localhost"
-        </IfFile>
-        <IfFile /etc/php/8.1>
-            SetHandler "proxy:unix:/run/php/php8.1-fpm.sock|fcgi://localhost"
-        </IfFile>
-        <IfFile /etc/php/8.2>
-            SetHandler "proxy:unix:/run/php/php8.2-fpm.sock|fcgi://localhost"
-        </IfFile>
-        <IfFile /etc/php/8.3>
-            SetHandler "proxy:unix:/run/php/php8.3-fpm.sock|fcgi://localhost"
-        </IfFile>
+        </ElseIf>
+        <ElseIf "-e '/run/php/php7.3-fpm.sock'">
+            SetHandler "proxy:unix:/run/php/php7.3-fpm.sock|fcgi://localhost"
+        </ElseIf>
+        <Else>
+            Require all denied
+        </Else>
     </FilesMatch>
     <FilesMatch ".+\.phps$">
         # Deny access to raw php sources by default