From 8e15889baea837bd293888b7271e70e63f0aed09 Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 10 Apr 2019 15:07:18 -0400 Subject: [PATCH 1/6] Generic config for letsencrypt --- sparkwallet/docker-compose.yaml | 2 +- welcome/docker-compose.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sparkwallet/docker-compose.yaml b/sparkwallet/docker-compose.yaml index af35289..a5d2f9b 100644 --- a/sparkwallet/docker-compose.yaml +++ b/sparkwallet/docker-compose.yaml @@ -10,7 +10,7 @@ services: - "$GATEKEEPER_DATAPATH/htpasswd:/htpasswd/htpasswd" labels: - "traefik.docker.network=cyphernodeappsnet" - - "traefik.frontend.rule=ReplacePathRegex: ^/sparkwallet(.*) $$1" + - "traefik.frontend.rule=Host:cyphernode.yourdomain.com; ReplacePathRegex: ^/sparkwallet(.*) $$1" - "traefik.frontend.passHostHeader=true" - "traefik.frontend.auth.basic.usersFile=/htpasswd/htpasswd" - "traefik.frontend.headers.customRequestHeaders=X-Access:FoeDdQw5yl7pPfqdlGy3OEk/txGqyJjSbVtffhzs7kc=" diff --git a/welcome/docker-compose.yaml b/welcome/docker-compose.yaml index ab22517..cdd33a6 100644 --- a/welcome/docker-compose.yaml +++ b/welcome/docker-compose.yaml @@ -4,7 +4,7 @@ services: cyphernode_welcome: environment: - "TRACING=1" - image: cyphernode/app_welcome:v0.2.0-rc.2 + image: cyphernode/app_welcome:v0.2.0-rc.5 volumes: - "$GATEKEEPER_DATAPATH/certs/cert.pem:/data/cert.pem" - "$GATEKEEPER_DATAPATH/keys.properties:/data/keys.properties" @@ -15,7 +15,7 @@ services: restart: always labels: - "traefik.docker.network=cyphernodeappsnet" - - "traefik.frontend.rule=PathPrefix:/welcome; PathPrefixStrip:/welcome" + - "traefik.frontend.rule=Host:cyphernode.yourdomain.com; PathPrefix:/welcome; PathPrefixStrip:/welcome" - "traefik.frontend.passHostHeader=true" - "traefik.enable=true" - "traefik.port=8080" From f28f87540f4ae80c0d6562aab21a859985821e42 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 10 Apr 2019 22:09:03 +0200 Subject: [PATCH 2/6] sparkwallet is no longer handling all request. removed cyphernodenet --- sparkwallet/docker-compose.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sparkwallet/docker-compose.yaml b/sparkwallet/docker-compose.yaml index a5d2f9b..61f4b03 100644 --- a/sparkwallet/docker-compose.yaml +++ b/sparkwallet/docker-compose.yaml @@ -10,18 +10,16 @@ services: - "$GATEKEEPER_DATAPATH/htpasswd:/htpasswd/htpasswd" labels: - "traefik.docker.network=cyphernodeappsnet" - - "traefik.frontend.rule=Host:cyphernode.yourdomain.com; ReplacePathRegex: ^/sparkwallet(.*) $$1" + - "traefik.frontend.rule=PathPrefix:/sparkwallet; PathPrefixStrip:/sparkwallet" - "traefik.frontend.passHostHeader=true" - "traefik.frontend.auth.basic.usersFile=/htpasswd/htpasswd" - "traefik.frontend.headers.customRequestHeaders=X-Access:FoeDdQw5yl7pPfqdlGy3OEk/txGqyJjSbVtffhzs7kc=" - "traefik.enable=true" - "traefik.port=9737" networks: - - cyphernodenet - cyphernodeappsnet restart: always networks: cyphernodeappsnet: external: true - cyphernodenet: - external: true \ No newline at end of file + From 15b72a158caf01b09dadbf4d4a42427d64812e22 Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 10 Apr 2019 18:57:24 -0400 Subject: [PATCH 3/6] Path redir is now working for sparkwallet! --- sparkwallet/docker-compose.yaml | 6 ++++-- sparkwallet/test.sh | 4 ++-- welcome/docker-compose.yaml | 2 +- welcome/test.sh | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sparkwallet/docker-compose.yaml b/sparkwallet/docker-compose.yaml index 61f4b03..f6fc0ce 100644 --- 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 index 8c8a142..da8bec8 100644 --- 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 index cdd33a6..be90940 100644 --- 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 index 0f10641..cdb82e4 100644 --- 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 From 834c2c9bbadf8c85d565cd109efb9e4baaefeb2f Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 10 Apr 2019 19:20:56 -0400 Subject: [PATCH 4/6] welcome still at rc4, it's ok --- welcome/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/welcome/docker-compose.yaml b/welcome/docker-compose.yaml index be90940..bee2a64 100644 --- a/welcome/docker-compose.yaml +++ b/welcome/docker-compose.yaml @@ -4,7 +4,7 @@ services: cyphernode_welcome: environment: - "TRACING=1" - image: cyphernode/app_welcome:v0.2.0-rc.5 + image: cyphernode/app_welcome:v0.2.0-rc.4 volumes: - "$GATEKEEPER_DATAPATH/certs/cert.pem:/data/cert.pem" - "$GATEKEEPER_DATAPATH/keys.properties:/data/keys.properties" From 21ed3455ad60b10c11228e1e7a6e370aa2599526 Mon Sep 17 00:00:00 2001 From: kexkey Date: Wed, 10 Apr 2019 22:22:36 -0400 Subject: [PATCH 5/6] On RPi, localhost hangs --- sparkwallet/test.sh | 2 +- welcome/test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sparkwallet/test.sh b/sparkwallet/test.sh index da8bec8..138e47a 100644 --- a/sparkwallet/test.sh +++ b/sparkwallet/test.sh @@ -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://127.0.0.1/sparkwallet/) [ "${rc}" -ne "401" ] && return 400 return 0 } diff --git a/welcome/test.sh b/welcome/test.sh index cdb82e4..1853ea8 100644 --- a/welcome/test.sh +++ b/welcome/test.sh @@ -25,7 +25,7 @@ timeout_feature() { do_test() { local rc - rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://localhost/welcome) + rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://127.0.0.1/welcome) [ "${rc}" -ne "401" ] && return 400 return 0 } From c96f7f069382924a471509ab150e63cc97cb4371 Mon Sep 17 00:00:00 2001 From: kexkey Date: Tue, 7 May 2019 16:24:05 -0400 Subject: [PATCH 6/6] v0.2.0 final release --- welcome/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/welcome/docker-compose.yaml b/welcome/docker-compose.yaml index bee2a64..b528e42 100644 --- a/welcome/docker-compose.yaml +++ b/welcome/docker-compose.yaml @@ -4,7 +4,7 @@ services: cyphernode_welcome: environment: - "TRACING=1" - image: cyphernode/app_welcome:v0.2.0-rc.4 + image: cyphernode/app_welcome:v0.2.0 volumes: - "$GATEKEEPER_DATAPATH/certs/cert.pem:/data/cert.pem" - "$GATEKEEPER_DATAPATH/keys.properties:/data/keys.properties"