From d06236556db8c7da538adf088d3c847bf387a408 Mon Sep 17 00:00:00 2001
From: valitovgaziz <valitovgaziz@yandex.ru>
Date: Thu, 31 Jul 2025 10:31:17 +0500
Subject: [PATCH] 	modified:   README.md 	modified:  
 docker-compose.yaml 	renamed:    certbot/Dockerfile ->
 serv_certbot/certbot/Dockerfile 	renamed:    certbot/config/certbot.ini
 -> serv_certbot/certbot/config/certbot.ini 	renamed:   
 certbot/scripts/checkRenewCerts.sh ->
 serv_certbot/certbot/scripts/checkRenewCerts.sh 	renamed:   
 certbot/scripts/crontab.txt -> serv_certbot/certbot/scripts/crontab.txt 
 renamed:    certbot/scripts/init-certbot.sh ->
 serv_certbot/certbot/scripts/init-certbot.sh 	renamed:   
 certbot/scripts/renewEasysite102.sh ->
 serv_certbot/certbot/scripts/renewEasysite102.sh 	renamed:   
 certbot/scripts/renewValitovGazizCert.sh ->
 serv_certbot/certbot/scripts/renewValitovGazizCert.sh 	renamed:   
 certbot/scripts/renewYalarbaCert.sh ->
 serv_certbot/certbot/scripts/renewYalarbaCert.sh 	new file:  
 serv_certbot/docker-compose.yml divite certbot service

---
 README.md                                     |  6 ++--
 docker-compose.yaml                           | 28 +------------------
 {certbot => serv_certbot/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_certbot/docker-compose.yml               | 21 ++++++++++++++
 11 files changed, 25 insertions(+), 30 deletions(-)
 rename {certbot => serv_certbot/certbot}/Dockerfile (100%)
 rename {certbot => serv_certbot/certbot}/config/certbot.ini (100%)
 rename {certbot => serv_certbot/certbot}/scripts/checkRenewCerts.sh (100%)
 rename {certbot => serv_certbot/certbot}/scripts/crontab.txt (100%)
 rename {certbot => serv_certbot/certbot}/scripts/init-certbot.sh (100%)
 rename {certbot => serv_certbot/certbot}/scripts/renewEasysite102.sh (100%)
 rename {certbot => serv_certbot/certbot}/scripts/renewValitovGazizCert.sh (100%)
 rename {certbot => serv_certbot/certbot}/scripts/renewYalarbaCert.sh (100%)
 create mode 100644 serv_certbot/docker-compose.yml

diff --git a/README.md b/README.md
index 5c2219c..0ad2f27 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 1. DB, rest api *
 2. Migrator     *
-3. spa          
-4. Nginx
-5. Certbot
+3. spa          *
+4. Certbot      
+5. nginx
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4ed6250..3a2475c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,11 +1,4 @@
 services:
-    
-
-
-
-
-
-
   nginx:
     build:
       context: ./nginx
@@ -28,23 +21,6 @@ services:
     depends_on:
       - certbot
 
-  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=valitovgaziz@yandex.ru
-      - DOMAINS=${ALL_DOMAINS}
-      - STAGING=0
-    restart: unless-stopped
-
 #  keycloak:
 #    build:
 #      context: ./keycloak
@@ -84,9 +60,7 @@ services:
 #      - internal
 
 volumes:
-  certbot_data:
-  certbot_www:
-  keycloak-postgres:    
+  keycloak-postgres:
 
 networks:
   web-network:
diff --git a/certbot/Dockerfile b/serv_certbot/certbot/Dockerfile
similarity index 100%
rename from certbot/Dockerfile
rename to serv_certbot/certbot/Dockerfile
diff --git a/certbot/config/certbot.ini b/serv_certbot/certbot/config/certbot.ini
similarity index 100%
rename from certbot/config/certbot.ini
rename to serv_certbot/certbot/config/certbot.ini
diff --git a/certbot/scripts/checkRenewCerts.sh b/serv_certbot/certbot/scripts/checkRenewCerts.sh
similarity index 100%
rename from certbot/scripts/checkRenewCerts.sh
rename to serv_certbot/certbot/scripts/checkRenewCerts.sh
diff --git a/certbot/scripts/crontab.txt b/serv_certbot/certbot/scripts/crontab.txt
similarity index 100%
rename from certbot/scripts/crontab.txt
rename to serv_certbot/certbot/scripts/crontab.txt
diff --git a/certbot/scripts/init-certbot.sh b/serv_certbot/certbot/scripts/init-certbot.sh
similarity index 100%
rename from certbot/scripts/init-certbot.sh
rename to serv_certbot/certbot/scripts/init-certbot.sh
diff --git a/certbot/scripts/renewEasysite102.sh b/serv_certbot/certbot/scripts/renewEasysite102.sh
similarity index 100%
rename from certbot/scripts/renewEasysite102.sh
rename to serv_certbot/certbot/scripts/renewEasysite102.sh
diff --git a/certbot/scripts/renewValitovGazizCert.sh b/serv_certbot/certbot/scripts/renewValitovGazizCert.sh
similarity index 100%
rename from certbot/scripts/renewValitovGazizCert.sh
rename to serv_certbot/certbot/scripts/renewValitovGazizCert.sh
diff --git a/certbot/scripts/renewYalarbaCert.sh b/serv_certbot/certbot/scripts/renewYalarbaCert.sh
similarity index 100%
rename from certbot/scripts/renewYalarbaCert.sh
rename to serv_certbot/certbot/scripts/renewYalarbaCert.sh
diff --git a/serv_certbot/docker-compose.yml b/serv_certbot/docker-compose.yml
new file mode 100644
index 0000000..a8f1f1d
--- /dev/null
+++ b/serv_certbot/docker-compose.yml
@@ -0,0 +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
+
+volumes:
+  certbot_data:
+  certbot_www:
\ No newline at end of file