diff --git a/Dockerfile/Nginx.Dockerfile b/Dockerfile/Nginx.Dockerfile index 859f7fa..4121d6a 100644 --- a/Dockerfile/Nginx.Dockerfile +++ b/Dockerfile/Nginx.Dockerfile @@ -8,6 +8,5 @@ RUN sed -i '/location \/adminer\//,/}/d' /etc/nginx/conf.d/default.conf # copy php files for ngnix to know they exist COPY ../php/public /var/www/memoires-info/php/public -COPY ../climateguardian_dev.com-key.pem /etc/nginx/ssl -COPY ../climateguardian_dev.com.pem /etc/nginx/ssl - +COPY ../climateguardian_dev.com-key.pem /etc/nginx +COPY ../climateguardian_dev.com.pem /etc/nginx diff --git a/docker-compose.yml b/docker-compose.yml index 0e0eeea..830523b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,10 +83,9 @@ services: volumes: - "./.env:/var/www/memoires-info/html/.env" - "./nginx.conf:/etc/nginx/conf.d/default.conf" - - "./climateguardian_dev.com.pem:/etc/nginx/ssl" - - "./climateguardian_dev.com-key.pem:/etc/nginx/ssl" + - "./climateguardian_dev.com.pem:/etc/nginx" + - "./climateguardian_dev.com-key.pem:/etc/nginx" - "./php:/var/www/memoires-info/php/" - - "" depends_on: - php - postg-rest diff --git a/nginx.conf b/nginx.conf index 79b89c6..f11f274 100644 --- a/nginx.conf +++ b/nginx.conf @@ -10,7 +10,6 @@ server { ssl_certificate_key climateguardian_dev.com-key.pem; - location /php { root /var/www/memoires-info/php/private; rewrite ^/php(.*)$ $1 break;