Path redir is now working for sparkwallet!

SatoshiPortal · Apr 10, 2019 · 15b72a1 · 15b72a1
1 parent f28f875
commit 15b72a1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/sparkwallet/docker-compose.yaml b/sparkwallet/docker-compose.yaml
@@ -10,7 +10,9 @@ services:
       - "$GATEKEEPER_DATAPATH/htpasswd:/htpasswd/htpasswd"
     labels:
       - "traefik.docker.network=cyphernodeappsnet"
-      - "traefik.frontend.rule=PathPrefix:/sparkwallet; PathPrefixStrip:/sparkwallet"
+      - "traefik.frontend.redirect.regex=^(.*)/sparkwallet$$"
+      - "traefik.frontend.redirect.replacement=$$1/sparkwallet/"
+      - "traefik.frontend.rule=PathPrefix:/sparkwallet;ReplacePathRegex: ^/sparkwallet/(.*) /$$1"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.frontend.auth.basic.usersFile=/htpasswd/htpasswd"
       - "traefik.frontend.headers.customRequestHeaders=X-Access:FoeDdQw5yl7pPfqdlGy3OEk/txGqyJjSbVtffhzs7kc="
@@ -22,4 +24,4 @@ services:
 networks:
   cyphernodeappsnet:
     external: true
-    
+
diff --git a/sparkwallet/test.sh b/sparkwallet/test.sh
@@ -15,7 +15,7 @@ timeout_feature() {
     # If no error or 2 minutes passed, we get out of this loop
     ([ "${returncode}" -eq "0" ] || [ $(date +%s) -gt ${endtime} ]) && break
 
-    printf "\e[1;31mMaybe it's too early, I'll retry every ${interval} seconds for $((${totaltime} / 60)) minutes ($((${endtime} - $(date +%s))) seconds left).\e[1;0m"
+    printf "\e[1;31mMaybe it's too early, I'll retry every ${interval} seconds for $((${totaltime} / 60)) minutes ($((${endtime} - $(date +%s))) seconds left).\e[1;0m\r\n"
 
     sleep ${interval}
   done
@@ -25,7 +25,7 @@ timeout_feature() {
 
 do_test() {
   local rc
-  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://localhost/sparkwallet)
+  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://localhost/sparkwallet/)
   [ "${rc}" -ne "401" ] && return 400
   return 0
 }

diff --git a/welcome/docker-compose.yaml b/welcome/docker-compose.yaml
@@ -15,7 +15,7 @@ services:
     restart: always
     labels:
       - "traefik.docker.network=cyphernodeappsnet"
-      - "traefik.frontend.rule=Host:cyphernode.yourdomain.com; PathPrefix:/welcome; PathPrefixStrip:/welcome"
+      - "traefik.frontend.rule=PathPrefixStrip:/welcome"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.enable=true"
       - "traefik.port=8080"

diff --git a/welcome/test.sh b/welcome/test.sh
@@ -15,7 +15,7 @@ timeout_feature() {
     # If no error or 2 minutes passed, we get out of this loop
     ([ "${returncode}" -eq "0" ] || [ $(date +%s) -gt ${endtime} ]) && break
 
-    printf "\e[1;31mMaybe it's too early, I'll retry every ${interval} seconds for $((${totaltime} / 60)) minutes ($((${endtime} - $(date +%s))) seconds left).\e[1;0m"
+    printf "\e[1;31mMaybe it's too early, I'll retry every ${interval} seconds for $((${totaltime} / 60)) minutes ($((${endtime} - $(date +%s))) seconds left).\e[1;0m\r\n"
 
     sleep ${interval}
   done