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

@@ -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

serv_certbot/docker-compose.yml

@@ -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:

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

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:
+  internal: