Merge remote changes and resolve conflicts

docker-compose.yml

@@ -13,13 +13,11 @@ 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
+      - certbot-etc:/etc/letsencrypt:ro
+      - certbot-var:/var/lib/letsencrypt:ro
       - webroot:/var/www/html
     depends_on:
       - backend
-    networks:
-      - app-network
 
   backend:
     build:
@@ -33,25 +31,15 @@ services:
     volumes:
       - ./backend:/app
       - sqlite_data:/app/instance
-    networks:
-      - app-network
 
   certbot:
-    image: certbot/certbot:latest
+    image: certbot/certbot
     container_name: certbot
     volumes:
       - certbot-etc:/etc/letsencrypt
       - certbot-var:/var/lib/letsencrypt
       - webroot:/var/www/html
-    depends_on:
-      - frontend
-    networks:
-      - app-network
-    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
-
-networks:
-  app-network:
-    driver: bridge
+    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:

init-letsencrypt.sh

@@ -1,34 +1,21 @@
 #!/bin/bash
 
-domains=(itformhelp.ru www.itformhelp.ru)
-email="admin@itformhelp.ru"
-staging=0 # Set to 1 if you're testing your setup
+# Остановить все контейнеры
+docker compose down -v
 
-# Create dummy certificates
-path="/etc/letsencrypt/live/$domains"
-docker compose run --rm --entrypoint "\
-  openssl req -x509 -nodes -newkey rsa:4096 -days 1\
-    -keyout '$path/privkey.pem' \
-    -out '$path/fullchain.pem' \
-    -subj '/CN=localhost'" certbot
+# Создать необходимые директории
+mkdir -p ./certbot/www
+mkdir -p ./certbot/conf
 
-echo "### Starting nginx ..."
-docker compose up --force-recreate -d frontend
+# Запустить только nginx для первичной проверки
+docker compose up -d frontend
 
-echo "### Deleting dummy certificate ..."
-docker compose run --rm --entrypoint "\
-  rm -Rf /etc/letsencrypt/live/$domains && \
-  rm -Rf /etc/letsencrypt/archive/$domains && \
-  rm -Rf /etc/letsencrypt/renewal/$domains.conf" certbot
+# Подождать, пока nginx запустится
+sleep 5
 
-echo "### Requesting Let's Encrypt certificate ..."
-docker compose run --rm --entrypoint "\
-  certbot certonly --webroot -w /var/www/html \
-    --email $email \
-    --agree-tos \
-    --no-eff-email \
-    --force-renewal \
-    ${staging:+--staging}" certbot
+# Запустить certbot для получения сертификата
+docker compose run --rm certbot
 
-echo "### Reloading nginx ..."
-docker compose exec frontend nginx -s reload
+# Перезапустить все сервисы
+docker compose down
+docker compose up -d