Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated outdated mentions of PHP 5 #87

Merged
merged 3 commits into from
Dec 27, 2024
Merged

Updated outdated mentions of PHP 5 #87

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06463ff
Updated outdated mentions of PHP 5
mnocon Dec 27, 2024
89357e8
Updated path to socket
mnocon Dec 27, 2024
9d966e6
Simplified socket path
mnocon Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/templates/apache2/vhost.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# See: https://wiki.apache.org/httpd/PHP-FPM#apache_httpd_2.4

# For best performance, prefer socket use. This requires Linux, and that both Apache and PHP has access to
# the socket file `/var/run/php5-fpm.sock` via local file system and hence run on the same machine.
#SetHandler "proxy:unix:/var/run/php5-fpm.sock|fcgi://localhost/"
# the socket file `/var/run/php/php8.3-fpm.sock` via local file system and hence run on the same machine.
#SetHandler "proxy:unix:/var/run/php/php8.3-fpm.sock|fcgi://localhost/"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#SetHandler "proxy:unix:/var/run/php/php8.3-fpm.sock|fcgi://localhost/"
#SetHandler "proxy:unix:/var/run/php/php-fpm.sock|fcgi://localhost/"

everywhere and you're gonna make this future proof without worrying about PHP 10 (internal pun) ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mateuszbieniek does this suggestion work for you? Don't want to change after you've already approved 😉

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yeah, just checked and there is indeed php-fpm.sock defaulting to 8.3 in my instance!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh boy, 20 years of using Linux and did not notice that...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improved in 9d966e6 , thank you!

# For TCP usage, if you're not on Linux, or Apache and PHP are on separate machines, instead use fcgi: form.
# (Optionally hint php-fpm processes count using: https://wiki.apache.org/httpd/PHP-FPM#Proxy_via_handler)
#SetHandler "proxy:fcgi://localhost/:9000"
Expand Down
2 changes: 1 addition & 1 deletion resources/templates/nginx/vhost.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ server {
include ibexa_params.d/ibexa_fastcgi_params;

# FPM socket
# Possible values : unix:/var/run/php5-fpm.sock or 127.0.0.1:9000
# Possible values : unix:/var/run/php/php8.3-fpm.sock or 127.0.0.1:9000
fastcgi_pass %FASTCGI_PASS%;

## Ibexa DXP ENVIRONMENT variables, used for customizing index.php execution (not used by console commands)
Expand Down
Loading