no more nginx

haqq/haqq/haqq-mainnet-haqq-pruned.yml

@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 
 services:
-  haqq-mainnet-client:
+  haqq-mainnet:
     image: ${HAQQ_HAQQ_IMAGE:-alhaqq/haqq}:${HAQQ_MAINNET_HAQQ_VERSION:-v1.8.3}
     sysctls:
       # TCP Performance
@@ -63,35 +63,24 @@ services:
     logging: *logging-defaults
     labels:
       - prometheus-scrape.enabled=false
-
-  haqq-mainnet:
-    image: nginx
-    expose:
-      - '80'
-    environment:
-      PROXY_HOST: haqq-mainnet-client
-      RPC_PATH: ''
-      RPC_PORT: 8545
-      WS_PATH: ''
-      WS_PORT: 8546
-    restart: unless-stopped
-    depends_on:
-      - haqq-mainnet-client
-    networks:
-      - chains
-    volumes:
-      - ./nginx-proxy:/etc/nginx/templates
-    logging: *logging-defaults
-    labels:
-      - prometheus-scrape.enabled=false
       - traefik.enable=true
       - traefik.http.middlewares.haqq-mainnet-haqq-pruned-stripprefix.stripprefix.prefixes=/haqq-mainnet
-      - traefik.http.services.haqq-mainnet-haqq-pruned.loadbalancer.server.port=80
+      - traefik.http.services.haqq-mainnet-haqq-pruned.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned.tls.certresolver=myresolver}
       - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned.rule=Host(`$DOMAIN`) && (Path(`/haqq-mainnet`) || Path(`/haqq-mainnet/`))}
       - ${NO_SSL:+traefik.http.routers.haqq-mainnet-haqq-pruned.rule=Path(`/haqq-mainnet`) || Path(`/haqq-mainnet/`)}
       - traefik.http.routers.haqq-mainnet-haqq-pruned.middlewares=haqq-mainnet-haqq-pruned-stripprefix, ipallowlist
+      - traefik.http.routers.haqq-mainnet-haqq-pruned.priority=50   # gets any request that is not GET with UPGRADE header
+      - traefik.http.routers.haqq-mainnet-haqq-pruned-ws.priority=100   # answers GET requests first
+      - traefik.http.services.haqq-mainnet-haqq-pruned-ws.loadbalancer.server.port=8546
+      - traefik.http.routers.haqq-mainnet-haqq-pruned-ws.service=haqq-mainnet-haqq-pruned-ws
+      - traefik.http.routers.haqq-mainnet-haqq-pruned.service=haqq-mainnet-haqq-pruned
+      - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned-ws.entrypoints=websecure}
+      - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned-ws.tls.certresolver=myresolver}
+      - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned-ws.rule=Host(`$DOMAIN`) && (Path(`/haqq-mainnet`) || Path(`/haqq-mainnet/`)) && Headers(`Upgrade`, `websocket`)}
+      - ${NO_SSL:+traefik.http.routers.haqq-mainnet-haqq-pruned-ws.rule=(Path(`/haqq-mainnet`) || Path(`/haqq-mainnet/`)) && Headers(`Upgrade`, `websocket`)}
+      - traefik.http.routers.haqq-mainnet-haqq-pruned-ws.middlewares=haqq-mainnet-haqq-pruned-stripprefix, ipallowlist
 
 volumes:
   haqq-mainnet-haqq-pruned: