Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions apache/vhost-with-ssl.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<VirtualHost *:443>
DocumentRoot "/var/www/eramba"
<Directory "/var/www/eramba">
AllowOverride all
Require all granted
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined

SSLCertificateFile /etc/ssl/certs/mycert.crt
SSLCertificateKeyFile /etc/ssl/private/mycert.key
</VirtualHost>

<VirtualHost *:80>
DocumentRoot "/var/www/eramba"
<Directory "/var/www/eramba">
AllowOverride all
Require all granted
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined

Redirect / https://localhost:8443/
</VirtualHost>
15 changes: 0 additions & 15 deletions apache/vhost.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
<VirtualHost *:443>
DocumentRoot "/var/www/eramba"
<Directory "/var/www/eramba">
AllowOverride all
Require all granted
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined

SSLCertificateFile /etc/ssl/certs/mycert.crt
SSLCertificateKeyFile /etc/ssl/private/mycert.key
</VirtualHost>

<VirtualHost *:80>
DocumentRoot "/var/www/eramba"
<Directory "/var/www/eramba">
Expand All @@ -19,6 +6,4 @@
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined

Redirect / https://localhost:8443/
</VirtualHost>
2 changes: 1 addition & 1 deletion docker-compose.simple-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- app:/var/www/eramba
- ./apache/ssl/mycert.crt:/etc/ssl/certs/mycert.crt
- ./apache/ssl/mycert.key:/etc/ssl/private/mycert.key
- ./apache/vhost.conf:/etc/apache2/sites-available/000-default.conf
- ./apache/vhost-with-ssl.conf:/etc/apache2/sites-available/000-default.conf
env_file:
- main.env
links:
Expand Down