diff --git a/.gitignore b/.gitignore index 06732062..42485519 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,9 @@ /nginx/ssl/*.key /nginx/ssl/*.csr -.DS_Store \ No newline at end of file +/apache2/ssl/*.crt +/apache2/ssl/*.key +/apache2/ssl/*.csr +/apache2/ssl/*.org + +.DS_Store diff --git a/apache2/ssl/.gitkeep b/apache2/ssl/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/docker-compose.yml b/docker-compose.yml index 07c47f65..b55a9ca3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -313,6 +313,7 @@ services: - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG} - ${APACHE_HOST_LOG_PATH}:/var/log/apache2 - ${APACHE_SITES_PATH}:/etc/apache2/sites-available + - ${APACHE_SSL_PATH}:/etc/apache2/ssl ports: - "${APACHE_HOST_HTTP_PORT}:80" - "${APACHE_HOST_HTTPS_PORT}:443" diff --git a/env-example b/env-example index 0fd9d9db..1148e307 100644 --- a/env-example +++ b/env-example @@ -233,6 +233,7 @@ APACHE_HOST_HTTP_PORT=80 APACHE_HOST_HTTPS_PORT=443 APACHE_HOST_LOG_PATH=./logs/apache2 APACHE_SITES_PATH=./apache2/sites +APACHE_SSL_PATH=./apache2/ssl APACHE_PHP_UPSTREAM_CONTAINER=php-fpm APACHE_PHP_UPSTREAM_PORT=9000 APACHE_PHP_UPSTREAM_TIMEOUT=60