diff --git a/README.md b/README.md index 0ad2f27..cfe1eb2 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,6 @@ 1. DB, rest api * 2. Migrator * 3. spa * -4. Certbot -5. nginx +4. Certbot * +5. nginx * diff --git a/docker-compose.yaml b/docker-compose.yaml index 3a2475c..a399891 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,25 +1,4 @@ services: - nginx: - build: - context: ./nginx - dockerfile: Dockerfile - env_file: .env - container_name: nginx - restart: unless-stopped - ports: - - "80:80" - - "443:443" - volumes: - - certbot_data:/etc/letsencrypt - - certbot_www:/var/www/certbot - - ./spa/vue/dist:/usr/share/nginx/html - - ./valitovgaziz/html:/usr/share/nginx/valitovgaziz/html - - ./easysite/easysite/build:/usr/share/nginx/easysite/html - networks: - - web-network - - internal - depends_on: - - certbot # keycloak: # build: diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml new file mode 100644 index 0000000..26ffae0 --- /dev/null +++ b/serv_nginx/docker-compose.yml @@ -0,0 +1,31 @@ +services: + nginx: + build: + context: ./nginx + dockerfile: Dockerfile + env_file: .env + container_name: nginx + restart: unless-stopped + ports: + - "80:80" + - "443:443" + volumes: + - certbot_data:/etc/letsencrypt + - certbot_www:/var/www/certbot + - ./spa/vue/dist:/usr/share/nginx/html + - ./valitovgaziz/html:/usr/share/nginx/valitovgaziz/html + - ./easysite/easysite/build:/usr/share/nginx/easysite/html + networks: + - web-network + - internal + depends_on: + - certbot + +volumes: + certbot_data: + certbot_www: + +networks: + web-network: + driver: bridge + internal: \ No newline at end of file diff --git a/nginx/Dockerfile b/serv_nginx/nginx/Dockerfile similarity index 100% rename from nginx/Dockerfile rename to serv_nginx/nginx/Dockerfile diff --git a/nginx/nginx-http.conf b/serv_nginx/nginx/nginx-http.conf similarity index 100% rename from nginx/nginx-http.conf rename to serv_nginx/nginx/nginx-http.conf diff --git a/nginx/nginx-ssl.conf b/serv_nginx/nginx/nginx-ssl.conf similarity index 100% rename from nginx/nginx-ssl.conf rename to serv_nginx/nginx/nginx-ssl.conf diff --git a/nginx/switch-config.sh b/serv_nginx/nginx/switch-config.sh similarity index 100% rename from nginx/switch-config.sh rename to serv_nginx/nginx/switch-config.sh