diff --git a/.env.production b/.env.production index f49b88a..d665556 100644 --- a/.env.production +++ b/.env.production @@ -18,7 +18,7 @@ PRODUCTION_ROOT_DOMAIN=ensl.org PRODUCTION_DOMAIN=www.ensl.org PRODUCTION_PORT=80 PRODUCTION_PORT_SSL=443 -PRODUCTION_NGINX_PATH=/var/www +PRODUCTION_NGINX_PUBLIC=/var/www MYSQL_DATABASE=ensl MYSQL_CONNECTION_POOL=48 diff --git a/docker-compose.yml b/docker-compose.yml index 59afca9..317f2d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -157,7 +157,7 @@ services: command: /bin/bash -c "cat /etc/nginx/conf.d/ensl_production/*.conf.template|envsubst '$$PRODUCTION_PUMA_PORT $$PRODUCTION_ROOT_DOMAIN $$PRODUCTION_DOMAIN $$PRODUCTION_PORT $$PRODUCTION_PORT_SSL $$PUMA_PORT $$APP_PATH $$APP_PATH_PUBLIC $$STAGING_ROOT_DOMAIN $$STAGING_DOMAIN $$STAGING_PORT $$STAGING_PORT_SSL' > /etc/nginx/conf.d/default.conf && cat /etc/nginx/conf.d/*.conf && nginx -g 'daemon off;'" # TODO: use env vars here volumes: - - ../../ensl/ensl.org/ext/ssl:/etc/ssl/ensl + - ../../ensl/ensl.org/ext/ssl:/etc/ssl - ../../ensl/ensl.org/public:/var/www/public - ../../ensl/ensl.org/ext/nginx.conf.d:/etc/nginx/conf.d/ensl_production - ../../ensl/ensl.org.staging/ext/nginx.conf.d:/etc/nginx/conf.d/ensl_staging @@ -173,6 +173,7 @@ services: - PRODUCTION_DOMAIN=$PRODUCTION_DOMAIN - PRODUCTION_PORT=$PRODUCTION_PORT - PRODUCTION_PORT_SSL=$PRODUCTION_PORT_SSL + - PRODUCTION_NGINX_PUBLIC=$PRODUCTION_NGINX_PUBLIC - STAGING_PUMA_PORT=$STAGING_PUMA_PORT - STAGING_ROOT_DOMAIN=$STAGING_ROOT_DOMAIN - STAGING_DOMAIN=$STAGING_DOMAIN