diff --git a/support/testing/tests/package/test_php/rootfs-overlay/etc/apache2/httpd.conf b/support/testing/tests/package/test_php/rootfs-overlay/etc/apache2/httpd.conf index 109247514b..75bad163db 100644 --- a/support/testing/tests/package/test_php/rootfs-overlay/etc/apache2/httpd.conf +++ b/support/testing/tests/package/test_php/rootfs-overlay/etc/apache2/httpd.conf @@ -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 User daemon @@ -27,8 +27,8 @@ ServerName localhost:80 Require all denied -DocumentRoot "/usr/htdocs" - +DocumentRoot "/usr/share/apache2/default-site/htdocs" + Options Indexes FollowSymLinks AllowOverride None Require all granted @@ -38,7 +38,7 @@ DocumentRoot "/usr/htdocs" Require all denied -ErrorLog "/var/logs/error_log" +ErrorLog "var/log/apache2/error_log" LogLevel warn @@ -49,10 +49,10 @@ LogLevel warn LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio - CustomLog "/var/logs/access_log" common + CustomLog "var/log/apache2/access_log" common - TypesConfig /etc/apache2/mime.types + TypesConfig etc/apache2/mime.types AddType application/x-httpd-php .php diff --git a/support/testing/tests/package/test_php/rootfs-overlay/usr/htdocs/script.php b/support/testing/tests/package/test_php/rootfs-overlay/usr/share/apache2/default-site/htdocs/script.php similarity index 100% rename from support/testing/tests/package/test_php/rootfs-overlay/usr/htdocs/script.php rename to support/testing/tests/package/test_php/rootfs-overlay/usr/share/apache2/default-site/htdocs/script.php