diff --git a/deploy/nginx/templates/default.conf.template b/deploy/nginx/templates/default.conf.template index 830b1a8..a672c3c 100644 --- a/deploy/nginx/templates/default.conf.template +++ b/deploy/nginx/templates/default.conf.template @@ -1,22 +1,27 @@ map $host $server_root { test.buyer.daxiangzj.com /var/www/html/public/buyer; test.seller.daxiangzj.com /var/www/html/public/seller; - buyer.daxiangzj.com /var/www/html/public/buyer; + #buyer.daxiangzj.com /var/www/html/public/buyer; + m168.yunduoxd.com /var/www/html/public/buyer; + www.dxzj8888.top /var/www/html/public/buyer; + www.dxzj8888.cn /var/www/html/public/buyer; seller.daxiangzj.com /var/www/html/public/seller; } map $host $api_host { + default api.yunduoxd.com; ~test.*.daxiangzj.com test.api.yunduoxd.com; ~*.daxiangzj.com api.yunduoxd.com; + ~*.yunduoxd.com api.yunduoxd.com; } server { listen 80 default_server; server_name _ ; - #access_log /var/log/nginx/$host.access.log main; + access_log /var/log/nginx/$host.access.log main; error_log /var/log/nginx/$host.error.log; - access_log none; + #access_log none; client_max_body_size 20m; diff --git a/docker-compose.yml b/docker-compose.yml index 1f050f5..83306f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,4 +42,4 @@ networks: web: external: true # curl http://buyer.daxiangzj.com:8011 --resolve buyer.daxiangzj.com:8011:127.0.0.1 -# curl http://seller.daxiangzj.com:8011 --resolve seller.daxiangzj.com:8011:127.0.0.1 \ No newline at end of file +# curl http://seller.daxiangzj.com:8011 --resolve seller.daxiangzj.com:8011:127.0.0.1 diff --git a/env.production b/env.production index 1a2fae6..e733810 100644 --- a/env.production +++ b/env.production @@ -1,3 +1,5 @@ ENV_NAME=product -BUYER_DOMAIN=buyer.daxiangzj.com +BUYER_DOMAIN=m168.yunduoxd.com +BUYER_DOMAIN2=www.dxzj8888.top +BUYER_DOMAIN3=www.dxzj8888.cn SELLER_DOMAIN=seller.daxiangzj.com diff --git a/full-docker-compose.yml b/full-docker-compose.yml new file mode 100644 index 0000000..ba4f28c --- /dev/null +++ b/full-docker-compose.yml @@ -0,0 +1,76 @@ +version: '3' +services: + nginx1: + image: nginx:1.22.0 + restart: always + networks: + - web + - internal + expose: + - 80 + extra_hosts: + - host.docker.internal:host-gateway + volumes: + - ./deploy/nginx/templates:/etc/nginx/templates + - $PWD:/var/www/html + labels: + - "traefik.enable=true" + - "traefik.docker.network=web" + - "traefik.http.routers.https-seller-jingcai-html-dist.tls=true" + - "traefik.http.routers.https-seller-jingcai-html-dist.tls.certresolver=myresolver" + - "traefik.http.routers.https-seller-jingcai-html-dist.rule=Host(`$SELLER_DOMAIN`)" + - "traefik.http.routers.https-seller-jingcai-html-dist.service=seller-jingcai-html-dist" + + - "traefik.http.routers.http-seller-jingcai-html-dist.rule=Host(`$SELLER_DOMAIN`)" + - "traefik.http.routers.http-seller-jingcai-html-dist.service=seller-jingcai-html-dist" + - "traefik.http.services.seller-jingcai-html-dist.loadbalancer.server.port=80" + #- "traefik.http.services.jingcai-html-dist.loadbalancer.server.port=80" + nginx2: + image: nginx:1.22.0 + restart: always + networks: + - web + - internal + expose: + - 80 + extra_hosts: + - host.docker.internal:host-gateway + volumes: + - ./deploy/nginx/templates:/etc/nginx/templates + - $PWD:/var/www/html + labels: + - "traefik.enable=true" + - "traefik.docker.network=web" + - "traefik.http.routers.https-buyer-jingcai-html-dist.tls=true" + - "traefik.http.routers.https-buyer-jingcai-html-dist.tls.certresolver=myresolver" + - "traefik.http.routers.https-buyer-jingcai-html-dist.rule=Host(`$BUYER_DOMAIN`) || Host(`$BUYER_DOMAIN2`)" + - "traefik.http.routers.https-buyer-jingcai-html-dist.service=buyer-jingcai-html-dist" + + - "traefik.http.routers.http-buyer-jingcai-html-dist.rule=Host(`$BUYER_DOMAIN`) || Host(`$BUYER_DOMAIN2`)" + - "traefik.http.routers.http-buyer-jingcai-html-dist.service=buyer-jingcai-html-dist" + - "traefik.http.services.buyer-jingcai-html-dist.loadbalancer.server.port=80" + + # new domain2 + # - "traefik.http.routers.https-buyer-jingcai-html-dist-domain2.tls=true" + # - "traefik.http.routers.https-buyer-jingcai-html-dist-domain2.tls.certresolver=myresolver" + # - "traefik.http.routers.https-buyer-jingcai-html-dist-domain2.rule=Host(`$BUYER_DOMAIN2`)" + # + # - "traefik.http.routers.http-buyer-jingcai-html-dist-domain2.rule=Host(`$BUYER_DOMAIN2`)" + # - "traefik.http.routers.http-buyer-jingcai-html-dist-domain2.service=buyer-jingcai-html-dist-domain2" + # - "traefik.http.services.buyer-jingcai-html-dist-domain2.loadbalancer.server.port=80" + + # # domain3 + # - "traefik.http.routers.https-buyer-jingcai-html-dist-domain3.tls=true" + # - "traefik.http.routers.https-buyer-jingcai-html-dist-domain3.tls.certresolver=myresolver" + # - "traefik.http.routers.https-buyer-jingcai-html-dist-domain3.rule=Host(`$BUYER_DOMAIN3`)" + # + # - "traefik.http.routers.http-buyer-jingcai-html-dist-domain3.rule=Host(`$BUYER_DOMAIN3`)" + # - "traefik.http.routers.http-buyer-jingcai-html-dist-domain3.service=buyer-jingcai-html-dist-domain3" + # - "traefik.http.services.buyer-jingcai-html-dist-domain3.loadbalancer.server.port=80" +networks: + internal: + external: false + web: + external: true +# curl http://buyer.daxiangzj.com:8011 --resolve buyer.daxiangzj.com:8011:127.0.0.1 +# curl http://seller.daxiangzj.com:8011 --resolve seller.daxiangzj.com:8011:127.0.0.1