From 73114b8506bbc06ab9e9cdf3c078691103bede4b Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Fri, 8 Aug 2025 16:54:47 +0500 Subject: [PATCH] deleted: serv_certbot/.env deleted: serv_certbot/docker-compose.yml modified: serv_nginx/.env renamed: serv_certbot/certbot/Dockerfile -> serv_nginx/certbot/Dockerfile renamed: serv_certbot/certbot/config/certbot.ini -> serv_nginx/certbot/config/certbot.ini renamed: serv_certbot/certbot/scripts/checkRenewCerts.sh -> serv_nginx/certbot/scripts/checkRenewCerts.sh renamed: serv_certbot/certbot/scripts/crontab.txt -> serv_nginx/certbot/scripts/crontab.txt renamed: serv_certbot/certbot/scripts/init-certbot.sh -> serv_nginx/certbot/scripts/init-certbot.sh renamed: serv_certbot/certbot/scripts/renewEasysite102.sh -> serv_nginx/certbot/scripts/renewEasysite102.sh renamed: serv_certbot/certbot/scripts/renewValitovGazizCert.sh -> serv_nginx/certbot/scripts/renewValitovGazizCert.sh renamed: serv_certbot/certbot/scripts/renewYalarbaCert.sh -> serv_nginx/certbot/scripts/renewYalarbaCert.sh modified: serv_nginx/docker-compose.yml merge certbot and nginx services --- serv_certbot/.env | 6 ------ serv_certbot/docker-compose.yml | 21 ------------------- serv_nginx/.env | 2 +- .../certbot/Dockerfile | 0 .../certbot/config/certbot.ini | 0 .../certbot/scripts/checkRenewCerts.sh | 0 .../certbot/scripts/crontab.txt | 0 .../certbot/scripts/init-certbot.sh | 0 .../certbot/scripts/renewEasysite102.sh | 0 .../certbot/scripts/renewValitovGazizCert.sh | 0 .../certbot/scripts/renewYalarbaCert.sh | 0 serv_nginx/docker-compose.yml | 21 ++++++++++++++++++- 12 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 serv_certbot/.env delete mode 100644 serv_certbot/docker-compose.yml rename {serv_certbot => serv_nginx}/certbot/Dockerfile (100%) rename {serv_certbot => serv_nginx}/certbot/config/certbot.ini (100%) rename {serv_certbot => serv_nginx}/certbot/scripts/checkRenewCerts.sh (100%) rename {serv_certbot => serv_nginx}/certbot/scripts/crontab.txt (100%) rename {serv_certbot => serv_nginx}/certbot/scripts/init-certbot.sh (100%) rename {serv_certbot => serv_nginx}/certbot/scripts/renewEasysite102.sh (100%) rename {serv_certbot => serv_nginx}/certbot/scripts/renewValitovGazizCert.sh (100%) rename {serv_certbot => serv_nginx}/certbot/scripts/renewYalarbaCert.sh (100%) diff --git a/serv_certbot/.env b/serv_certbot/.env deleted file mode 100644 index 3837551..0000000 --- a/serv_certbot/.env +++ /dev/null @@ -1,6 +0,0 @@ - -EMAIL=valitovgaziz@yandex.ru -DOMAINS_yalarba=yalarba.ru,www.yalarba.ru -DOMAINS_valitovgaziz=valitovgaziz.ru,www.valitovgaziz.ru -DOMAINS_easysite102=easysite102.ru,www.easysite102.ru -ALL_DOMAINS=yalarba.ru,www.yalarba.ru,valitovgaziz.ru,www.valitovgaziz.ru,easysite102.ru,www.easysite102.ru \ No newline at end of file diff --git a/serv_certbot/docker-compose.yml b/serv_certbot/docker-compose.yml deleted file mode 100644 index a8f1f1d..0000000 --- a/serv_certbot/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -services: - certbot: - build: - context: ./certbot - dockerfile: Dockerfile - container_name: certbot - volumes: - - ./certbot/config:/etc/letsencrypt/config - - certbot_data:/etc/letsencrypt - - certbot_www:/var/www/certbot - env_file: - - .env - environment: - - EMAIL=${EMAIL} - - DOMAINS=${ALL_DOMAINS} - - STAGING=0 - restart: unless-stopped - -volumes: - certbot_data: - certbot_www: \ No newline at end of file diff --git a/serv_nginx/.env b/serv_nginx/.env index b2ee6cd..5676299 100644 --- a/serv_nginx/.env +++ b/serv_nginx/.env @@ -1,5 +1,5 @@ +#CERTBOT NGINX VARIABLES -# NGINX EMAIL=valitovgaziz@yandex.ru DOMAINS_yalarba=yalarba.ru,www.yalarba.ru DOMAINS_valitovgaziz=valitovgaziz.ru,www.valitovgaziz.ru diff --git a/serv_certbot/certbot/Dockerfile b/serv_nginx/certbot/Dockerfile similarity index 100% rename from serv_certbot/certbot/Dockerfile rename to serv_nginx/certbot/Dockerfile diff --git a/serv_certbot/certbot/config/certbot.ini b/serv_nginx/certbot/config/certbot.ini similarity index 100% rename from serv_certbot/certbot/config/certbot.ini rename to serv_nginx/certbot/config/certbot.ini diff --git a/serv_certbot/certbot/scripts/checkRenewCerts.sh b/serv_nginx/certbot/scripts/checkRenewCerts.sh similarity index 100% rename from serv_certbot/certbot/scripts/checkRenewCerts.sh rename to serv_nginx/certbot/scripts/checkRenewCerts.sh diff --git a/serv_certbot/certbot/scripts/crontab.txt b/serv_nginx/certbot/scripts/crontab.txt similarity index 100% rename from serv_certbot/certbot/scripts/crontab.txt rename to serv_nginx/certbot/scripts/crontab.txt diff --git a/serv_certbot/certbot/scripts/init-certbot.sh b/serv_nginx/certbot/scripts/init-certbot.sh similarity index 100% rename from serv_certbot/certbot/scripts/init-certbot.sh rename to serv_nginx/certbot/scripts/init-certbot.sh diff --git a/serv_certbot/certbot/scripts/renewEasysite102.sh b/serv_nginx/certbot/scripts/renewEasysite102.sh similarity index 100% rename from serv_certbot/certbot/scripts/renewEasysite102.sh rename to serv_nginx/certbot/scripts/renewEasysite102.sh diff --git a/serv_certbot/certbot/scripts/renewValitovGazizCert.sh b/serv_nginx/certbot/scripts/renewValitovGazizCert.sh similarity index 100% rename from serv_certbot/certbot/scripts/renewValitovGazizCert.sh rename to serv_nginx/certbot/scripts/renewValitovGazizCert.sh diff --git a/serv_certbot/certbot/scripts/renewYalarbaCert.sh b/serv_nginx/certbot/scripts/renewYalarbaCert.sh similarity index 100% rename from serv_certbot/certbot/scripts/renewYalarbaCert.sh rename to serv_nginx/certbot/scripts/renewYalarbaCert.sh diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index 3ff14b0..c2696a5 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -1,4 +1,21 @@ services: + certbot: + build: + context: ./certbot + dockerfile: Dockerfile + container_name: certbot + volumes: + - ./certbot/config:/etc/letsencrypt/config + - certbot_data:/etc/letsencrypt + - certbot_www:/var/www/certbot + env_file: + - .env + environment: + - EMAIL=${EMAIL} + - DOMAINS=${ALL_DOMAINS} + - STAGING=0 + restart: unless-stopped + nginx: build: context: ./nginx @@ -18,6 +35,8 @@ services: networks: - web-network - internal + dependson: + - certbot volumes: certbot_data: @@ -26,4 +45,4 @@ volumes: networks: web-network: driver: bridge - internal: \ No newline at end of file + internal: