nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-01-21 07:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

apache: Handle transition to php 7.4

Browse Source 
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>
This commit is contained in:
Sunil Mohan Adapa 2020-03-04 16:36:54 -08:00 committed by James Valleroy
parent 296f6dbe85
commit 2ed47b047d
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plinth/modules/apache/data/etc/apache2/conf-available/php-fpm-freedombox.conf
View File

@ -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