From 070c60a60431fa37e04bda71193c947cd30b2d66 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 17:54:13 +0100 Subject: [PATCH 01/18] added path routing --- README.md | 1 + docker-compose.yml | 28 +++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 909bf624..a3b5a3a5 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ Otherwise traefik will not issue the certificate for an existing domain.
#### TODO !!!! alles uebr traefik aufen lassen? mal alle geth clients mit erigon vergleichen +LOGFILES General Monitoring
Bootstrapping from Snapshots
diff --git a/docker-compose.yml b/docker-compose.yml index fc7d1859..f1c85b1e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,6 +45,16 @@ services: command: "--goerli --http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .goerli --verbosity 3" networks: - $NET_POKT + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.geth-goerli-stripprefix.stripprefix.prefixes=/goerli" + - "traefik.http.services.geth-goerli.loadbalancer.server.port=8545" + - "traefik.http.routers.geth-goerli.entrypoints=websecure" + - "traefik.http.routers.geth-goerli.tls.certresolver=myresolver" + - "traefik.http.routers.geth-goerli.middlewares=auth" + - "traefik.http.routers.geth-goerli.rule=Host(`$DOMAIN`) && PathPrefix(`/goerli`)" + - "traefik.http.routers.geth-goerli.middlewares=geth-goerli-stripprefix" + geth-rinkeby: image: ethereum/client-go:latest @@ -58,6 +68,16 @@ services: networks: - $NET_POKT restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.geth-rinkeby-stripprefix.stripprefix.prefixes=/rinkeby" + - "traefik.http.services.geth-rinkeby.loadbalancer.server.port=8545" + - "traefik.http.routers.geth-rinkeby.entrypoints=websecure" + - "traefik.http.routers.geth-rinkeby.tls.certresolver=myresolver" + - "traefik.http.routers.geth-rinkeby.middlewares=auth" + - "traefik.http.routers.geth-rinkeby.rule=Host(`$DOMAIN`) && PathPrefix(`/rinkeby`)" + - "traefik.http.routers.geth-rinkeby.middlewares=geth-rinkeby-stripprefix" + geth-ropsten: image: ethereum/client-go:latest @@ -166,11 +186,13 @@ services: - $NET_POKT labels: - "traefik.enable=true" - - "traefik.http.services.myservice.loadbalancer.server.port=8081" - - "traefik.http.routers.pocket-mainnet.rule=Host(`$DOMAIN`)" + - "traefik.http.middlewares.pocket-mainnet-stripprefix.stripprefix.prefixes=/pokt" + - "traefik.http.services.pocket-mainner.loadbalancer.server.port=8081" - "traefik.http.routers.pocket-mainnet.entrypoints=websecure" - "traefik.http.routers.pocket-mainnet.tls.certresolver=myresolver" - "traefik.http.routers.pocket-mainnet.middlewares=auth" + - "traefik.http.routers.pocket-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/pokt`)" + - "traefik.http.routers.pocket-mainnet.middlewares=pocket-mainnet-stripprefix" restart: unless-stopped @@ -284,4 +306,4 @@ networks: pocket: driver: bridge monitor-net: - driver: bridge + driver: bridge \ No newline at end of file From f971b815e4b689797a640a6ef4c5442b0b881dc5 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 17:57:59 +0100 Subject: [PATCH 02/18] added path routing for erigon-trace --- docker-compose.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f1c85b1e..aeba58f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,7 +55,6 @@ services: - "traefik.http.routers.geth-goerli.rule=Host(`$DOMAIN`) && PathPrefix(`/goerli`)" - "traefik.http.routers.geth-goerli.middlewares=geth-goerli-stripprefix" - geth-rinkeby: image: ethereum/client-go:latest expose: @@ -78,7 +77,6 @@ services: - "traefik.http.routers.geth-rinkeby.rule=Host(`$DOMAIN`) && PathPrefix(`/rinkeby`)" - "traefik.http.routers.geth-rinkeby.middlewares=geth-rinkeby-stripprefix" - geth-ropsten: image: ethereum/client-go:latest expose: @@ -110,12 +108,22 @@ services: expose: - "30303" - "30304" + - "9090" volumes: - erigon-trace:/home/erigon/.local/share/erigon command: erigon --chain mainnet --metrics --metrics.addr=0.0.0.0 --metrics.port=6060 --private.api.addr=0.0.0.0:9090 --pprof --pprof.addr=0.0.0.0 --pprof.port=6061 networks: - $NET_POKT restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.erigon-trace-stripprefix.stripprefix.prefixes=/erigon" + - "traefik.http.services.erigon-trace.loadbalancer.server.port=9090" + - "traefik.http.routers.erigon-trace.entrypoints=websecure" + - "traefik.http.routers.erigon-trace.tls.certresolver=myresolver" + - "traefik.http.routers.erigon-trace.middlewares=auth" + - "traefik.http.routers.erigon-trace.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" + - "traefik.http.routers.erigon-trace.middlewares=erigon-trace-stripprefix" rpcdaemon: image: thorax/erigon:latest From 4230fd8e66637d0f52452db7ef3abc67a619efb0 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 18:04:11 +0100 Subject: [PATCH 03/18] erigon labels and rpcdaemon gehangen --- docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index aeba58f8..545d133b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,15 +115,6 @@ services: networks: - $NET_POKT restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.middlewares.erigon-trace-stripprefix.stripprefix.prefixes=/erigon" - - "traefik.http.services.erigon-trace.loadbalancer.server.port=9090" - - "traefik.http.routers.erigon-trace.entrypoints=websecure" - - "traefik.http.routers.erigon-trace.tls.certresolver=myresolver" - - "traefik.http.routers.erigon-trace.middlewares=auth" - - "traefik.http.routers.erigon-trace.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" - - "traefik.http.routers.erigon-trace.middlewares=erigon-trace-stripprefix" rpcdaemon: image: thorax/erigon:latest @@ -138,6 +129,15 @@ services: - "erigon-trace" networks: - $NET_POKT + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.rpcdaemon-stripprefix.stripprefix.prefixes=/erigon" + - "traefik.http.services.rpcdaemon.loadbalancer.server.port=9090" + - "traefik.http.routers.rpcdaemon.entrypoints=websecure" + - "traefik.http.routers.rpcdaemon.tls.certresolver=myresolver" + - "traefik.http.routers.rpcdaemon.middlewares=auth" + - "traefik.http.routers.rpcdaemon.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" + - "traefik.http.routers.rpcdaemon.middlewares=erigon-trace-stripprefix" avalanche: image: avaplatform/avalanchego From 5c5771b1603340ba423b5ec35cedaf538c1ba645 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 18:06:36 +0100 Subject: [PATCH 04/18] fix port --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 545d133b..09b1c0b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -132,7 +132,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.middlewares.rpcdaemon-stripprefix.stripprefix.prefixes=/erigon" - - "traefik.http.services.rpcdaemon.loadbalancer.server.port=9090" + - "traefik.http.services.rpcdaemon.loadbalancer.server.port=8545" - "traefik.http.routers.rpcdaemon.entrypoints=websecure" - "traefik.http.routers.rpcdaemon.tls.certresolver=myresolver" - "traefik.http.routers.rpcdaemon.middlewares=auth" From 8744326813753bf679647c76af8a6c2f79fc5b63 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 18:11:50 +0100 Subject: [PATCH 05/18] fix label --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 09b1c0b7..2ebb70b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -137,7 +137,7 @@ services: - "traefik.http.routers.rpcdaemon.tls.certresolver=myresolver" - "traefik.http.routers.rpcdaemon.middlewares=auth" - "traefik.http.routers.rpcdaemon.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" - - "traefik.http.routers.rpcdaemon.middlewares=erigon-trace-stripprefix" + - "traefik.http.routers.rpcdaemon.middlewares=rpcdaemon-stripprefix" avalanche: image: avaplatform/avalanchego From 9626dde9eea46c833b777721ea187d80221a99c8 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 18:18:26 +0100 Subject: [PATCH 06/18] added path routes for mainnet avalanche and erigon --- docker-compose.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2ebb70b0..73502cea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,6 +89,15 @@ services: networks: - $NET_POKT restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.geth-ropsten-stripprefix.stripprefix.prefixes=/ropsten" + - "traefik.http.services.geth-ropsten.loadbalancer.server.port=8545" + - "traefik.http.routers.geth-ropsten.entrypoints=websecure" + - "traefik.http.routers.geth-ropsten.tls.certresolver=myresolver" + - "traefik.http.routers.geth-ropsten.middlewares=auth" + - "traefik.http.routers.geth-ropsten.rule=Host(`$DOMAIN`) && PathPrefix(`/ropsten`)" + - "traefik.http.routers.geth-ropsten.middlewares=geth-ropsten-stripprefix" geth-mainnet: image: ethereum/client-go:latest @@ -102,6 +111,15 @@ services: networks: - $NET_POKT restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.geth-mainnet-stripprefix.stripprefix.prefixes=/geth" + - "traefik.http.services.geth-mainnet.loadbalancer.server.port=8545" + - "traefik.http.routers.geth-mainnet.entrypoints=websecure" + - "traefik.http.routers.geth-mainnet.tls.certresolver=myresolver" + - "traefik.http.routers.geth-mainnet.middlewares=auth" + - "traefik.http.routers.geth-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/geth`)" + - "traefik.http.routers.geth-mainnet.middlewares=geth-mainnet-stripprefix" erigon-trace: image: thorax/erigon @@ -151,6 +169,15 @@ services: networks: - $NET_POKT restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.avalanche-stripprefix.stripprefix.prefixes=/erigon" + - "traefik.http.services.avalanche.loadbalancer.server.port=8545" + - "traefik.http.routers.avalanche.entrypoints=websecure" + - "traefik.http.routers.avalanche.tls.certresolver=myresolver" + - "traefik.http.routers.avalanche.middlewares=auth" + - "traefik.http.routers.avalanche.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" + - "traefik.http.routers.avalanche.middlewares=avalanche-stripprefix" pocket-testnet: image: poktnetwork/pocket-core:stagenet-latest From dd5c1d591c096d1777fd4a206d1c3c2af40db407 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 18:22:24 +0100 Subject: [PATCH 07/18] added path routes for pokt-testnet, fix avalanche label --- docker-compose.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 73502cea..710fa23d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -171,12 +171,12 @@ services: restart: unless-stopped labels: - "traefik.enable=true" - - "traefik.http.middlewares.avalanche-stripprefix.stripprefix.prefixes=/erigon" + - "traefik.http.middlewares.avalanche-stripprefix.stripprefix.prefixes=/avalanche" - "traefik.http.services.avalanche.loadbalancer.server.port=8545" - "traefik.http.routers.avalanche.entrypoints=websecure" - "traefik.http.routers.avalanche.tls.certresolver=myresolver" - "traefik.http.routers.avalanche.middlewares=auth" - - "traefik.http.routers.avalanche.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" + - "traefik.http.routers.avalanche.rule=Host(`$DOMAIN`) && PathPrefix(`/avalanche`)" - "traefik.http.routers.avalanche.middlewares=avalanche-stripprefix" pocket-testnet: @@ -198,6 +198,15 @@ services: networks: - $NET_POKT restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.pocket-testnet-stripprefix.stripprefix.prefixes=/pokttest" + - "traefik.http.services.pocket-testnet.loadbalancer.server.port=8081" + - "traefik.http.routers.pocket-testnet.entrypoints=websecure" + - "traefik.http.routers.pocket-testnet.tls.certresolver=myresolver" + - "traefik.http.routers.pocket-testnet.middlewares=auth" + - "traefik.http.routers.pocket-testnet.rule=Host(`$DOMAIN`) && PathPrefix(`/pokttest`)" + - "traefik.http.routers.pocket-testnet.middlewares=pocket-mainnet-stripprefix" pocket-mainnet: image: poktnetwork/pocket-core:stagenet-latest From 47498e7cea6e35000a3281eb6e3363592238df50 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 18:25:41 +0100 Subject: [PATCH 08/18] try ip for haprox --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 710fa23d..b17b29c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ services: - "traefik.http.routers.geth-goerli.entrypoints=websecure" - "traefik.http.routers.geth-goerli.tls.certresolver=myresolver" - "traefik.http.routers.geth-goerli.middlewares=auth" - - "traefik.http.routers.geth-goerli.rule=Host(`$DOMAIN`) && PathPrefix(`/goerli`)" + - "traefik.http.routers.geth-goerli.rule=Host(`94.130.212.199`) && PathPrefix(`/goerli`)" - "traefik.http.routers.geth-goerli.middlewares=geth-goerli-stripprefix" geth-rinkeby: From 38f2d0e27fc766bf31243a2858d40b79f4bf4482 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 18:59:52 +0100 Subject: [PATCH 09/18] added basic auth to goerli --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b17b29c7..21c185af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,6 @@ services: - "/var/run/docker.sock:/var/run/docker.sock:ro" labels: - "traefik.enable=true" - - "traefik.http.middlewares.auth.basicauth.users=$AUTH_HTTP" ### NODES geth-goerli: @@ -47,12 +46,13 @@ services: - $NET_POKT labels: - "traefik.enable=true" + - "traefik.http.middlewares.geth-goerli.basicauth.users=$AUTH_HTTP" - "traefik.http.middlewares.geth-goerli-stripprefix.stripprefix.prefixes=/goerli" - "traefik.http.services.geth-goerli.loadbalancer.server.port=8545" - "traefik.http.routers.geth-goerli.entrypoints=websecure" - "traefik.http.routers.geth-goerli.tls.certresolver=myresolver" - "traefik.http.routers.geth-goerli.middlewares=auth" - - "traefik.http.routers.geth-goerli.rule=Host(`94.130.212.199`) && PathPrefix(`/goerli`)" + - "traefik.http.routers.geth-goerli.rule=Host(`$HOSTIP`) && PathPrefix(`/goerli`)" - "traefik.http.routers.geth-goerli.middlewares=geth-goerli-stripprefix" geth-rinkeby: From 5121652be3d0f8b5315380bf5bacebf07f91a216 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 19:16:13 +0100 Subject: [PATCH 10/18] middleware can overwrite middleware, so i put it into one label --- docker-compose.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 21c185af..90001e9c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,14 +46,12 @@ services: - $NET_POKT labels: - "traefik.enable=true" - - "traefik.http.middlewares.geth-goerli.basicauth.users=$AUTH_HTTP" - "traefik.http.middlewares.geth-goerli-stripprefix.stripprefix.prefixes=/goerli" - "traefik.http.services.geth-goerli.loadbalancer.server.port=8545" - "traefik.http.routers.geth-goerli.entrypoints=websecure" - "traefik.http.routers.geth-goerli.tls.certresolver=myresolver" - - "traefik.http.routers.geth-goerli.middlewares=auth" - "traefik.http.routers.geth-goerli.rule=Host(`$HOSTIP`) && PathPrefix(`/goerli`)" - - "traefik.http.routers.geth-goerli.middlewares=geth-goerli-stripprefix" + - "traefik.http.routers.geth-goerli.middlewares=geth-goerli-stripprefix, auth" geth-rinkeby: image: ethereum/client-go:latest @@ -75,7 +73,7 @@ services: - "traefik.http.routers.geth-rinkeby.tls.certresolver=myresolver" - "traefik.http.routers.geth-rinkeby.middlewares=auth" - "traefik.http.routers.geth-rinkeby.rule=Host(`$DOMAIN`) && PathPrefix(`/rinkeby`)" - - "traefik.http.routers.geth-rinkeby.middlewares=geth-rinkeby-stripprefix" + - "traefik.http.routers.geth-rinkeby.middlewares=geth-rinkeby-stripprefix, auth" geth-ropsten: image: ethereum/client-go:latest @@ -97,7 +95,7 @@ services: - "traefik.http.routers.geth-ropsten.tls.certresolver=myresolver" - "traefik.http.routers.geth-ropsten.middlewares=auth" - "traefik.http.routers.geth-ropsten.rule=Host(`$DOMAIN`) && PathPrefix(`/ropsten`)" - - "traefik.http.routers.geth-ropsten.middlewares=geth-ropsten-stripprefix" + - "traefik.http.routers.geth-ropsten.middlewares=geth-ropsten-stripprefix, auth" geth-mainnet: image: ethereum/client-go:latest @@ -119,7 +117,7 @@ services: - "traefik.http.routers.geth-mainnet.tls.certresolver=myresolver" - "traefik.http.routers.geth-mainnet.middlewares=auth" - "traefik.http.routers.geth-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/geth`)" - - "traefik.http.routers.geth-mainnet.middlewares=geth-mainnet-stripprefix" + - "traefik.http.routers.geth-mainnet.middlewares=geth-mainnet-stripprefix, auth" erigon-trace: image: thorax/erigon @@ -155,7 +153,7 @@ services: - "traefik.http.routers.rpcdaemon.tls.certresolver=myresolver" - "traefik.http.routers.rpcdaemon.middlewares=auth" - "traefik.http.routers.rpcdaemon.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" - - "traefik.http.routers.rpcdaemon.middlewares=rpcdaemon-stripprefix" + - "traefik.http.routers.rpcdaemon.middlewares=rpcdaemon-stripprefix, auth" avalanche: image: avaplatform/avalanchego @@ -177,7 +175,7 @@ services: - "traefik.http.routers.avalanche.tls.certresolver=myresolver" - "traefik.http.routers.avalanche.middlewares=auth" - "traefik.http.routers.avalanche.rule=Host(`$DOMAIN`) && PathPrefix(`/avalanche`)" - - "traefik.http.routers.avalanche.middlewares=avalanche-stripprefix" + - "traefik.http.routers.avalanche.middlewares=avalanche-stripprefix, auth" pocket-testnet: image: poktnetwork/pocket-core:stagenet-latest @@ -206,7 +204,7 @@ services: - "traefik.http.routers.pocket-testnet.tls.certresolver=myresolver" - "traefik.http.routers.pocket-testnet.middlewares=auth" - "traefik.http.routers.pocket-testnet.rule=Host(`$DOMAIN`) && PathPrefix(`/pokttest`)" - - "traefik.http.routers.pocket-testnet.middlewares=pocket-mainnet-stripprefix" + - "traefik.http.routers.pocket-testnet.middlewares=pocket-mainnet-stripprefix, auth" pocket-mainnet: image: poktnetwork/pocket-core:stagenet-latest @@ -236,7 +234,7 @@ services: - "traefik.http.routers.pocket-mainnet.tls.certresolver=myresolver" - "traefik.http.routers.pocket-mainnet.middlewares=auth" - "traefik.http.routers.pocket-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/pokt`)" - - "traefik.http.routers.pocket-mainnet.middlewares=pocket-mainnet-stripprefix" + - "traefik.http.routers.pocket-mainnet.middlewares=pocket-mainnet-stripprefix, auth" restart: unless-stopped From 6b2040fa064db15c67145f60144b517c197c16b7 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 19:20:08 +0100 Subject: [PATCH 11/18] middleware can overwrite middleware, so i put it into one label again.... --- docker-compose.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 90001e9c..45bd759b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock:ro" labels: - "traefik.enable=true" + - "traefik.http.middlewares.auth.basicauth.users=$AUTH_HTTP" ### NODES geth-goerli: @@ -71,7 +72,6 @@ services: - "traefik.http.services.geth-rinkeby.loadbalancer.server.port=8545" - "traefik.http.routers.geth-rinkeby.entrypoints=websecure" - "traefik.http.routers.geth-rinkeby.tls.certresolver=myresolver" - - "traefik.http.routers.geth-rinkeby.middlewares=auth" - "traefik.http.routers.geth-rinkeby.rule=Host(`$DOMAIN`) && PathPrefix(`/rinkeby`)" - "traefik.http.routers.geth-rinkeby.middlewares=geth-rinkeby-stripprefix, auth" @@ -93,7 +93,6 @@ services: - "traefik.http.services.geth-ropsten.loadbalancer.server.port=8545" - "traefik.http.routers.geth-ropsten.entrypoints=websecure" - "traefik.http.routers.geth-ropsten.tls.certresolver=myresolver" - - "traefik.http.routers.geth-ropsten.middlewares=auth" - "traefik.http.routers.geth-ropsten.rule=Host(`$DOMAIN`) && PathPrefix(`/ropsten`)" - "traefik.http.routers.geth-ropsten.middlewares=geth-ropsten-stripprefix, auth" @@ -115,7 +114,6 @@ services: - "traefik.http.services.geth-mainnet.loadbalancer.server.port=8545" - "traefik.http.routers.geth-mainnet.entrypoints=websecure" - "traefik.http.routers.geth-mainnet.tls.certresolver=myresolver" - - "traefik.http.routers.geth-mainnet.middlewares=auth" - "traefik.http.routers.geth-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/geth`)" - "traefik.http.routers.geth-mainnet.middlewares=geth-mainnet-stripprefix, auth" @@ -151,7 +149,6 @@ services: - "traefik.http.services.rpcdaemon.loadbalancer.server.port=8545" - "traefik.http.routers.rpcdaemon.entrypoints=websecure" - "traefik.http.routers.rpcdaemon.tls.certresolver=myresolver" - - "traefik.http.routers.rpcdaemon.middlewares=auth" - "traefik.http.routers.rpcdaemon.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" - "traefik.http.routers.rpcdaemon.middlewares=rpcdaemon-stripprefix, auth" @@ -173,7 +170,6 @@ services: - "traefik.http.services.avalanche.loadbalancer.server.port=8545" - "traefik.http.routers.avalanche.entrypoints=websecure" - "traefik.http.routers.avalanche.tls.certresolver=myresolver" - - "traefik.http.routers.avalanche.middlewares=auth" - "traefik.http.routers.avalanche.rule=Host(`$DOMAIN`) && PathPrefix(`/avalanche`)" - "traefik.http.routers.avalanche.middlewares=avalanche-stripprefix, auth" @@ -202,7 +198,6 @@ services: - "traefik.http.services.pocket-testnet.loadbalancer.server.port=8081" - "traefik.http.routers.pocket-testnet.entrypoints=websecure" - "traefik.http.routers.pocket-testnet.tls.certresolver=myresolver" - - "traefik.http.routers.pocket-testnet.middlewares=auth" - "traefik.http.routers.pocket-testnet.rule=Host(`$DOMAIN`) && PathPrefix(`/pokttest`)" - "traefik.http.routers.pocket-testnet.middlewares=pocket-mainnet-stripprefix, auth" @@ -232,7 +227,6 @@ services: - "traefik.http.services.pocket-mainner.loadbalancer.server.port=8081" - "traefik.http.routers.pocket-mainnet.entrypoints=websecure" - "traefik.http.routers.pocket-mainnet.tls.certresolver=myresolver" - - "traefik.http.routers.pocket-mainnet.middlewares=auth" - "traefik.http.routers.pocket-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/pokt`)" - "traefik.http.routers.pocket-mainnet.middlewares=pocket-mainnet-stripprefix, auth" restart: unless-stopped From 47aa602ecb069e4922f26d9859bdbdf66125d179 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 19:22:02 +0100 Subject: [PATCH 12/18] no networks --- docker-compose.yml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 45bd759b..a0cd9833 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,8 @@ services: ports: - "443:443" - "127.0.0.1:8080:8080" - networks: - - $NET_POKT +# networks: +# - $NET_POKT command: - "--api=true" - "--api.insecure=true" @@ -43,8 +43,8 @@ services: volumes: - geth-goerli:/.goerli command: "--goerli --http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .goerli --verbosity 3" - networks: - - $NET_POKT +# networks: +# - $NET_POKT labels: - "traefik.enable=true" - "traefik.http.middlewares.geth-goerli-stripprefix.stripprefix.prefixes=/goerli" @@ -63,8 +63,8 @@ services: volumes: - geth-rinkeby:/.rinkeby command: "--rinkeby --http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .rinkeby --verbosity 3" - networks: - - $NET_POKT +# networks: +# - $NET_POKT restart: unless-stopped labels: - "traefik.enable=true" @@ -84,8 +84,8 @@ services: volumes: - geth-ropsten:/.ropsten command: "--ropsten --http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .ropsten --verbosity 3" - networks: - - $NET_POKT +# networks: +# - $NET_POKT restart: unless-stopped labels: - "traefik.enable=true" @@ -105,8 +105,8 @@ services: volumes: - geth-mainnet:/.mainnet command: "--http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .mainnet --verbosity 3" - networks: - - $NET_POKT +# networks: +# - $NET_POKT restart: unless-stopped labels: - "traefik.enable=true" @@ -126,8 +126,8 @@ services: volumes: - erigon-trace:/home/erigon/.local/share/erigon command: erigon --chain mainnet --metrics --metrics.addr=0.0.0.0 --metrics.port=6060 --private.api.addr=0.0.0.0:9090 --pprof --pprof.addr=0.0.0.0 --pprof.port=6061 - networks: - - $NET_POKT +# networks: +# - $NET_POKT restart: unless-stopped rpcdaemon: @@ -141,8 +141,8 @@ services: restart: unless-stopped depends_on: - "erigon-trace" - networks: - - $NET_POKT +# networks: +# - $NET_POKT labels: - "traefik.enable=true" - "traefik.http.middlewares.rpcdaemon-stripprefix.stripprefix.prefixes=/erigon" @@ -161,8 +161,8 @@ services: volumes: - avalanche:/root/.avalanche command: "/avalanchego/build/avalanchego --http-host=" - networks: - - $NET_POKT +# networks: +# - $NET_POKT restart: unless-stopped labels: - "traefik.enable=true" @@ -219,8 +219,8 @@ services: - ./chains/chains_mainnet.json:/home/app/.pocket/config/chains.json - ./bootstrap_skript/pokt_mainnet.sh:/home/app/.pocket/pokt_mainnet.sh - pocket-mainnet:/home/app/.pocket - networks: - - $NET_POKT +# networks: +# - $NET_POKT labels: - "traefik.enable=true" - "traefik.http.middlewares.pocket-mainnet-stripprefix.stripprefix.prefixes=/pokt" @@ -338,8 +338,8 @@ volumes: ### NETWORKS -networks: - pocket: - driver: bridge - monitor-net: - driver: bridge \ No newline at end of file +#networks: +# pocket: +# driver: bridge +# monitor-net: +# driver: bridge \ No newline at end of file From 905d1e37b7730434f4d3b259298e02c9fa15fae6 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 19:22:32 +0100 Subject: [PATCH 13/18] no networks --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a0cd9833..8ae0838c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -189,8 +189,8 @@ services: volumes: - ./chains/chains_testnet.json:/home/app/.pocket/config/chains.json - pocket-testnet:/home/app/.pocket - networks: - - $NET_POKT +# networks: +# - $NET_POKT restart: unless-stopped labels: - "traefik.enable=true" From d99c45a5988858e5ae120610dc37ea5836e68689 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 19:24:08 +0100 Subject: [PATCH 14/18] changed hostname with hostip for haproxy --- docker-compose.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8ae0838c..a57b41ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,7 +72,7 @@ services: - "traefik.http.services.geth-rinkeby.loadbalancer.server.port=8545" - "traefik.http.routers.geth-rinkeby.entrypoints=websecure" - "traefik.http.routers.geth-rinkeby.tls.certresolver=myresolver" - - "traefik.http.routers.geth-rinkeby.rule=Host(`$DOMAIN`) && PathPrefix(`/rinkeby`)" + - "traefik.http.routers.geth-rinkeby.rule=Host(`$HOSTIP`) && PathPrefix(`/rinkeby`)" - "traefik.http.routers.geth-rinkeby.middlewares=geth-rinkeby-stripprefix, auth" geth-ropsten: @@ -93,7 +93,7 @@ services: - "traefik.http.services.geth-ropsten.loadbalancer.server.port=8545" - "traefik.http.routers.geth-ropsten.entrypoints=websecure" - "traefik.http.routers.geth-ropsten.tls.certresolver=myresolver" - - "traefik.http.routers.geth-ropsten.rule=Host(`$DOMAIN`) && PathPrefix(`/ropsten`)" + - "traefik.http.routers.geth-ropsten.rule=Host(`$HOSTIP`) && PathPrefix(`/ropsten`)" - "traefik.http.routers.geth-ropsten.middlewares=geth-ropsten-stripprefix, auth" geth-mainnet: @@ -114,7 +114,7 @@ services: - "traefik.http.services.geth-mainnet.loadbalancer.server.port=8545" - "traefik.http.routers.geth-mainnet.entrypoints=websecure" - "traefik.http.routers.geth-mainnet.tls.certresolver=myresolver" - - "traefik.http.routers.geth-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/geth`)" + - "traefik.http.routers.geth-mainnet.rule=Host(`$HOSTIP`) && PathPrefix(`/geth`)" - "traefik.http.routers.geth-mainnet.middlewares=geth-mainnet-stripprefix, auth" erigon-trace: @@ -149,7 +149,7 @@ services: - "traefik.http.services.rpcdaemon.loadbalancer.server.port=8545" - "traefik.http.routers.rpcdaemon.entrypoints=websecure" - "traefik.http.routers.rpcdaemon.tls.certresolver=myresolver" - - "traefik.http.routers.rpcdaemon.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon`)" + - "traefik.http.routers.rpcdaemon.rule=Host(`$HOSTIP`) && PathPrefix(`/erigon`)" - "traefik.http.routers.rpcdaemon.middlewares=rpcdaemon-stripprefix, auth" avalanche: @@ -170,7 +170,7 @@ services: - "traefik.http.services.avalanche.loadbalancer.server.port=8545" - "traefik.http.routers.avalanche.entrypoints=websecure" - "traefik.http.routers.avalanche.tls.certresolver=myresolver" - - "traefik.http.routers.avalanche.rule=Host(`$DOMAIN`) && PathPrefix(`/avalanche`)" + - "traefik.http.routers.avalanche.rule=Host(`$HOSTIP`) && PathPrefix(`/avalanche`)" - "traefik.http.routers.avalanche.middlewares=avalanche-stripprefix, auth" pocket-testnet: @@ -198,7 +198,7 @@ services: - "traefik.http.services.pocket-testnet.loadbalancer.server.port=8081" - "traefik.http.routers.pocket-testnet.entrypoints=websecure" - "traefik.http.routers.pocket-testnet.tls.certresolver=myresolver" - - "traefik.http.routers.pocket-testnet.rule=Host(`$DOMAIN`) && PathPrefix(`/pokttest`)" + - "traefik.http.routers.pocket-testnet.rule=Host(`$HOSTIP`) && PathPrefix(`/pokttest`)" - "traefik.http.routers.pocket-testnet.middlewares=pocket-mainnet-stripprefix, auth" pocket-mainnet: @@ -227,7 +227,7 @@ services: - "traefik.http.services.pocket-mainner.loadbalancer.server.port=8081" - "traefik.http.routers.pocket-mainnet.entrypoints=websecure" - "traefik.http.routers.pocket-mainnet.tls.certresolver=myresolver" - - "traefik.http.routers.pocket-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/pokt`)" + - "traefik.http.routers.pocket-mainnet.rule=Host(`$HOSTIP`) && PathPrefix(`/pokt`)" - "traefik.http.routers.pocket-mainnet.middlewares=pocket-mainnet-stripprefix, auth" restart: unless-stopped From d6f7415d80db79621815a64144aee0c4270781b1 Mon Sep 17 00:00:00 2001 From: cventastic Date: Tue, 21 Dec 2021 20:23:51 +0100 Subject: [PATCH 15/18] wrong hostname in command parameters --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a57b41ea..85de7f4a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -132,7 +132,7 @@ services: rpcdaemon: image: thorax/erigon:latest - command: rpcdaemon --datadir=/home/erigon/.local/share/erigon --private.api.addr=erigon:9090 --txpool.api.addr=erigon:9090 --http.addr=0.0.0.0 --http.vhosts=* --http.corsdomain=* --http.api=eth,debug,net,trace --ws + command: rpcdaemon --datadir=/home/erigon/.local/share/erigon --private.api.addr=erigon-trace:9090 --txpool.api.addr=erigon-trace:9090 --http.addr=0.0.0.0 --http.vhosts=* --http.corsdomain=* --http.api=eth,debug,net,trace --ws pid: service:erigon-trace # Use erigon's PID namespace. It's required to open Erigon's DB from another process (RPCDaemon local-mode) volumes: - erigon-trace:/home/erigon/.local/share/erigon From 031cce3ec50b50746b254709c2ac8fab08b7faea Mon Sep 17 00:00:00 2001 From: cventastic Date: Wed, 22 Dec 2021 14:36:30 +0100 Subject: [PATCH 16/18] add wireguard skel --- wireguard/config/wg0.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 wireguard/config/wg0.conf diff --git a/wireguard/config/wg0.conf b/wireguard/config/wg0.conf new file mode 100644 index 00000000..e69de29b From ab1738143f66aa08e35bc53a68a332efb19a3d46 Mon Sep 17 00:00:00 2001 From: cventastic Date: Wed, 22 Dec 2021 14:51:51 +0100 Subject: [PATCH 17/18] updated README --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index a3b5a3a5..20a214cd 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,6 @@ Wireguard-Server: Paste wireguard wg0.conf from wireguard-server to wireguard/co ``` git clone https://github.com/cventastic/POKT_DOKT.git -git submodule update --init --recursive -git pull --recurse-submodules cd POKT_DOKT git reset --hard origin/main && git pull && chown 1005:1001 -R chains/ bootstrap_skript/ && chmod u+x bootstrap_skript/pokt_mainnet.shdocker-compose up -d ``` From 14281ced301210fd974cbbc4d9f8bdc11165fbad Mon Sep 17 00:00:00 2001 From: cventastic Date: Wed, 22 Dec 2021 16:51:28 +0100 Subject: [PATCH 18/18] updated README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 20a214cd..fb220193 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,6 @@ Check if there is a file here /traefic/letsencrypt/acme.json if yes, you have to Otherwise traefik will not issue the certificate for an existing domain.
#### TODO !!!! -alles uebr traefik aufen lassen? mal alle geth clients mit erigon vergleichen LOGFILES