Skip to content

Commit 501fc29

Browse files
neffetsneffets
committed
Fix DRUPAL_SUBDIR not finding index.php
1 parent f542c62 commit 501fc29

78 files changed

Lines changed: 1872 additions & 78 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎10.3/php8.2/apache-bookworm/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

‎10.3/php8.2/apache-bullseye/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

‎10.3/php8.2/fpm-alpine3.21/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

‎10.3/php8.2/fpm-alpine3.22/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

‎10.3/php8.2/fpm-bookworm/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

‎10.3/php8.2/fpm-bullseye/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

‎10.3/php8.3/apache-bookworm/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

‎10.3/php8.3/apache-bullseye/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

‎10.3/php8.3/fpm-alpine3.21/docker-php-entrypoint‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
77
/bin/rm "/etc/apache2/sites-enabled/000-default.conf"
88
cat >/etc/apache2/sites-enabled/000-default.conf <<EOT
99
<VirtualHost *:80>
10+
# The ServerName directive sets the request scheme, hostname and port that
11+
# the server uses to identify itself. This is used when creating
12+
# redirection URLs. In the context of virtual hosts, the ServerName
13+
# specifies what hostname must appear in the request's Host: header to
14+
# match this virtual host. For the default virtual host (this file) this
15+
# value is not decisive as it is used as a last resort host regardless.
16+
# However, you must set it for any further virtual host explicitly.
17+
#ServerName www.example.com
18+
1019
ServerAdmin webmaster@localhost
1120
DocumentRoot /var/www/html
21+
22+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
23+
# error, crit, alert, emerg.
24+
# It is also possible to configure the loglevel for particular
25+
# modules, e.g.
26+
#LogLevel info ssl:warn
27+
1228
ErrorLog \${APACHE_LOG_DIR}/error.log
1329
CustomLog \${APACHE_LOG_DIR}/access.log combined
1430
31+
# For most configuration files from conf-available/, which are
32+
# enabled or disabled at a global level, it is possible to
33+
# include a line for only one particular virtual host. For example the
34+
# following line enables the CGI configuration for this host only
35+
# after it has been globally disabled with "a2disconf".
36+
#Include conf-available/serve-cgi-bin.conf
37+
1538
<Directory "/var/www/html">
1639
RewriteEngine on
1740
RewriteBase ${DRUPAL_SUBDIR}
@@ -26,7 +49,7 @@ if [ "x${DRUPAL_SUBDIR}" != "x" ]; then
2649
Deny From All
2750
</FilesMatch>
2851
</Directory>
29-
Alias ${DRUPAL_SUBDIR} /var/www/html
52+
Alias ${DRUPAL_SUBDIR} /var/www/html/
3053
</VirtualHost>
3154
EOT
3255
fi

0 commit comments

Comments
 (0)