diff --git a/apache/vhost-with-ssl.conf b/apache/vhost-with-ssl.conf new file mode 100644 index 0000000..68cb245 --- /dev/null +++ b/apache/vhost-with-ssl.conf @@ -0,0 +1,24 @@ + + DocumentRoot "/var/www/eramba" + + AllowOverride all + Require all granted + + 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 + + + + DocumentRoot "/var/www/eramba" + + AllowOverride all + Require all granted + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Redirect / https://localhost:8443/ + diff --git a/apache/vhost.conf b/apache/vhost.conf index 68cb245..e9ea008 100644 --- a/apache/vhost.conf +++ b/apache/vhost.conf @@ -1,16 +1,3 @@ - - DocumentRoot "/var/www/eramba" - - AllowOverride all - Require all granted - - 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 - - DocumentRoot "/var/www/eramba" @@ -19,6 +6,4 @@ ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined - - Redirect / https://localhost:8443/ diff --git a/docker-compose.simple-install.yml b/docker-compose.simple-install.yml index ac9956f..9dee49d 100644 --- a/docker-compose.simple-install.yml +++ b/docker-compose.simple-install.yml @@ -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: