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