Merge pull request #26 from canopy-network/fix/host-to-path

Fix/host to path

Author: pablocampogo

docker_image/Dockerfile

@@ -1,7 +1,5 @@
 FROM node:18-alpine AS builder 
 
-ARG WALLET_DIR
-ARG EXPLORER_DIR 
 ARG BRANCH='latest'
 ARG CLI_DIR
 ARG BUILD_PATH=cmd/cli
@@ -26,6 +24,7 @@ RUN echo "Building from BRANCH=${BRANCH}" && \
 # copy golang 
 COPY --from=golang:1.23.9-alpine  /usr/local/go/ /usr/local/go/
 ENV PATH="/usr/local/go/bin:${PATH}"
+
 RUN go version
 # Builds 
 RUN apk update && apk add --no-cache make bash nodejs npm 

monitoring-stack/README.md

@@ -169,19 +169,19 @@ It will also properly configure to expose canopy nodes explorer, rpc and wallet
 
 Node1 config.json
 ```
-  "rpcURL": "https://rpc.node1.<YOUR_DOMAIN>:50002",
+  "rpcURL": "https://node1.<YOUR_DOMAIN>/rpc",
 
-  "adminRPCUrl": "https://adminrpc.node1.<YOUR_DOMAIN>:50003",
+  "adminRPCUrl": "https://node1.<YOUR_DOMAIN>/adminrpc",
 
   "externalAddress": "tcp://node1.<YOUR_DOMAIN>",
 ```
 
 Node2 config.json
 
 ```
-  "rpcURL": "https://rpc.node2.<YOUR_DOMAIN>:40002",
+  "rpcURL": "https://node2.<YOUR_DOMAIN>/rpc",
   
-  "adminRPCUrl": "https://admin.node2.<YOUR_DOMAIN>:40003",
+  "adminRPCUrl": "https://node2.<YOUR_DOMAIN>/adminrpc",
 
   "externalAddress": "tcp://node2.<YOUR_DOMAIN>",
 ```

monitoring-stack/docker-compose.yaml

@@ -21,11 +21,9 @@ services:
       dockerfile: ./Dockerfile
       network: host
       args:
-        EXPLORER_BASE_PATH: '/'
-        WALLET_BASE_PATH: '/'
         BUILD_PATH: cmd/cli
         BIN_PATH: $BIN_PATH
-        BRANCH: latest
+        BRANCH: latest 
     env_file:
       - .env
     ports:

monitoring-stack/loadbalancer/services/local.yaml

@@ -50,7 +50,7 @@ http:
       - web
     canopy-monitoring-local:
       rule: Host(`monitoring.localhost`)
-      service: canopy-monitoring 
+      service: canopy-monitoring-local
       priority: 1
       entryPoints:
       - web

monitoring-stack/loadbalancer/services/middleware.yaml

@@ -25,6 +25,40 @@ http:
         users:
           - "canopy:$apr1$GnHnOP0b$zWcOv5kosOuUAuvrlu72C0"
 
+    strip-wallet-prefix:
+      stripPrefix:
+        prefixes:
+          - "/wallet"
+
+    strip-explorer-prefix:
+      stripPrefix:
+        prefixes:
+          - "/explorer"
+
+    strip-rpc-prefix:
+      stripPrefix:
+        prefixes:
+          - "/rpc"
+
+    strip-adminrpc-prefix:
+      stripPrefix:
+        prefixes:
+          - "/adminrpc"
+
+   # Redirect /wallet to /wallet/
+    wallet-redirect:
+      redirectRegex:
+        regex: "^(.*)/wallet$"
+        replacement: "${1}/wallet/"
+        permanent: true
+
+    # Redirect /explorer to /explorer/
+    explorer-redirect:
+      redirectRegex:
+        regex: "^(.*)/explorer$"
+        replacement: "${1}/explorer/"
+        permanent: true
+
     websocket-headers:
       headers:
         customRequestHeaders: