mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-10 00:04:06 -09:00
support/testing: php: fix test by switching to "Debian" filesystem layout
Buildroot commit [1] (package/apache: use "Debian" filesystem layout to fix read-only rootfs) changed the filesystem layout. This had the effect of installing files to different locations and breaking the test_php runtime test. This commit fixes the issue by updating the file paths to their right locations. The "httpd.conf" was updated by following the same recipe described in the comment (starting from a config file as installed by the apache Buildroot package). Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/16060152979 [1]1006666f67Signed-off-by: Julien Olivain <ju.o@free.fr> Tested-by: Romain Naour <romain.naour@smile.fr> Signed-off-by: Julien Olivain <ju.o@free.fr> (cherry picked from commit23fd881bdb) Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
This commit is contained in:
committed by
Raphaël Mélotte
parent
23c2ccc716
commit
936d3afa8e
@@ -5,14 +5,14 @@
|
||||
# - "ServerName localhost:80" added to remove startup warning,
|
||||
# - "AddType application/x-httpd-php .php" added to enable php.
|
||||
|
||||
ServerRoot "/usr"
|
||||
ServerRoot "/"
|
||||
Listen 80
|
||||
|
||||
LoadModule authz_core_module modules/mod_authz_core.so
|
||||
LoadModule mime_module modules/mod_mime.so
|
||||
LoadModule log_config_module modules/mod_log_config.so
|
||||
LoadModule unixd_module modules/mod_unixd.so
|
||||
LoadModule php_module modules/libphp.so
|
||||
LoadModule authz_core_module usr/lib/apache2/modules/mod_authz_core.so
|
||||
LoadModule mime_module usr/lib/apache2/modules/mod_mime.so
|
||||
LoadModule log_config_module usr/lib/apache2/modules/mod_log_config.so
|
||||
LoadModule unixd_module usr/lib/apache2/modules/mod_unixd.so
|
||||
LoadModule php_module usr/lib/apache2/modules/libphp.so
|
||||
|
||||
<IfModule unixd_module>
|
||||
User daemon
|
||||
@@ -27,8 +27,8 @@ ServerName localhost:80
|
||||
Require all denied
|
||||
</Directory>
|
||||
|
||||
DocumentRoot "/usr/htdocs"
|
||||
<Directory "/usr/htdocs">
|
||||
DocumentRoot "/usr/share/apache2/default-site/htdocs"
|
||||
<Directory "/usr/share/apache2/default-site/htdocs">
|
||||
Options Indexes FollowSymLinks
|
||||
AllowOverride None
|
||||
Require all granted
|
||||
@@ -38,7 +38,7 @@ DocumentRoot "/usr/htdocs"
|
||||
Require all denied
|
||||
</Files>
|
||||
|
||||
ErrorLog "/var/logs/error_log"
|
||||
ErrorLog "var/log/apache2/error_log"
|
||||
LogLevel warn
|
||||
|
||||
<IfModule log_config_module>
|
||||
@@ -49,10 +49,10 @@ LogLevel warn
|
||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
|
||||
</IfModule>
|
||||
|
||||
CustomLog "/var/logs/access_log" common
|
||||
CustomLog "var/log/apache2/access_log" common
|
||||
</IfModule>
|
||||
|
||||
<IfModule mime_module>
|
||||
TypesConfig /etc/apache2/mime.types
|
||||
TypesConfig etc/apache2/mime.types
|
||||
AddType application/x-httpd-php .php
|
||||
</IfModule>
|
||||
|
||||
Reference in New Issue
Block a user