diff --git a/docker-compose.yml b/docker-compose.yml index a71c75d..691c262 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,12 +7,9 @@ services: restart: unless-stopped ports: - "80:80" - - "443:443" volumes: - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro - - certbot-etc:/etc/letsencrypt - - certbot-var:/var/lib/letsencrypt - webroot:/var/www/html depends_on: - backend @@ -29,8 +26,8 @@ services: volumes: - ./backend:/app - sqlite_data:/app/instance - ports: - - "8000:8000" + expose: + - "8000" certbot: image: certbot/certbot @@ -39,7 +36,9 @@ services: - certbot-etc:/etc/letsencrypt - certbot-var:/var/lib/letsencrypt - webroot:/var/www/html - command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email --force-renewal --staging -d itformhelp.ru -d www.itformhelp.ru + depends_on: + - frontend + command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email --force-renewal -d itformhelp.ru -d www.itformhelp.ru volumes: sqlite_data: diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf index 705237f..0942860 100644 --- a/docker/nginx/conf.d/default.conf +++ b/docker/nginx/conf.d/default.conf @@ -3,12 +3,12 @@ server { listen [::]:80; server_name itformhelp.ru www.itformhelp.ru; - root /usr/share/nginx/html; + root /var/www/html; index index.html; - location ~ /.well-known/acme-challenge { + location ^~ /.well-known/acme-challenge/ { allow all; - root /var/www/html; + default_type "text/plain"; } location / {