mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-03-18 09:10:49 +00:00
bf1ed7d064
- Redirect with separate identifiers so that they can retrieved separately. - Enable virtual host log format that include name of the domain accessed so that that information is preserved. - There is no need to increment the apache app's version number as it has been incremented earlier in the patch series (for this release). Tests: - In a fresh container, setup succeeds. Default apache sites 000-default.conf and default-ssl.conf are disabled. freedombox-default.conf is enabled. Apache access logs and error logs are sent to systemd journal. - Without the patch applied, create a container. Run setup and access Plinth interface. Apply the patches. Apache setup is run. a2query -s default and a2query -s 000-default show that sites are not enabled. a2query -s freedombox-default shows that site is enabled. Apache access logs and error logs are sent to systemd journal. Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org> Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
36 lines
1.2 KiB
Plaintext
36 lines
1.2 KiB
Plaintext
## SPDX-License-Identifier: AGPL-3.0-or-later
|
|
##
|
|
## DO NOT EDIT. If you do, FreedomBox will not automatically upgrade.
|
|
##
|
|
## Apache configuration managed by FreedomBox. If customization is needed,
|
|
## create a new configuration file with higher priority and override directives.
|
|
##
|
|
## Default apache sites default.conf and 000-default-ssl.conf will be disabled
|
|
## for the sake of the following configuration. This is primarily to override
|
|
## the logging directives (to allow default values to prevail).
|
|
##
|
|
|
|
# Keep this in sync with apache default 000-default.conf
|
|
<VirtualHost *:80>
|
|
ServerAdmin webmaster@localhost
|
|
DocumentRoot /var/www/html
|
|
</VirtualHost>
|
|
|
|
# Keep this in sync with apache default default-ssl.conf
|
|
<IfModule mod_ssl.c>
|
|
<VirtualHost _default_:443>
|
|
ServerAdmin webmaster@localhost
|
|
DocumentRoot /var/www/html
|
|
|
|
SSLEngine on
|
|
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
|
|
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
|
|
<FilesMatch "\.(?:cgi|shtml|phtml|php)$">
|
|
SSLOptions +StdEnvVars
|
|
</FilesMatch>
|
|
<Directory /usr/lib/cgi-bin>
|
|
SSLOptions +StdEnvVars
|
|
</Directory>
|
|
</VirtualHost>
|
|
</IfModule>
|