mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
Merge remote changes and resolve conflicts
This commit is contained in:
@@ -13,9 +13,8 @@ services:
|
||||
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
|
||||
- ./certbot/www:/var/www/html:ro
|
||||
- ./certbot/conf:/etc/letsencrypt:ro
|
||||
depends_on:
|
||||
- backend
|
||||
|
||||
@@ -35,17 +34,12 @@ services:
|
||||
- "8000:8000"
|
||||
|
||||
certbot:
|
||||
image: certbot/certbot
|
||||
image: certbot/certbot:latest
|
||||
container_name: certbot
|
||||
volumes:
|
||||
- certbot-etc:/etc/letsencrypt
|
||||
- certbot-var:/var/lib/letsencrypt
|
||||
- webroot:/var/www/html
|
||||
depends_on:
|
||||
- frontend
|
||||
command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email -d itformhelp.ru -d www.itformhelp.ru
|
||||
- ./certbot/conf:/etc/letsencrypt:rw
|
||||
- ./certbot/www:/var/www/html:rw
|
||||
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:
|
||||
certbot-etc:
|
||||
certbot-var:
|
||||
webroot:
|
Reference in New Issue
Block a user