From d7c6d409d7434b60fa51d8c4649f5c93869c9dfd Mon Sep 17 00:00:00 2001
From: cventastic <sven@sven-holter.de>
Date: Mon, 27 Dec 2021 11:36:06 +0100
Subject: [PATCH] add ip whitelist

---
 docker-compose.pokt-mainnet.yml |  1 -
 docker-compose.traefik.yml      |  1 -
 docker-compose.yml              | 10 +---------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/docker-compose.pokt-mainnet.yml b/docker-compose.pokt-mainnet.yml
index 47a3110b..1968accf 100644
--- a/docker-compose.pokt-mainnet.yml
+++ b/docker-compose.pokt-mainnet.yml
@@ -26,7 +26,6 @@ services:
       - "traefik.http.routers.pocket-mainnet.rule=Host(`$DOMAIN`)"
       - "traefik.http.routers.pocket-mainnet.entrypoints=websecure"
       - "traefik.http.routers.pocket-mainnet.tls.certresolver=myresolver"
-      - "traefik.http.routers.pocket-mainnet.middlewares=auth"
     restart: unless-stopped
 
 
diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml
index 758ae48c..f8e688ed 100644
--- a/docker-compose.traefik.yml
+++ b/docker-compose.traefik.yml
@@ -29,5 +29,4 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.auth.basicauth.users=$AUTH_HTTP"
       - "traefik.http.middlewares.test-ipwhitelist.ipwhitelist.sourcerange=$WHITELIST"
diff --git a/docker-compose.yml b/docker-compose.yml
index 5fa41c68..f4df4a7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.auth.basicauth.users=$AUTH_HTTP"
+      - "traefik.http.middlewares.test-ipwhitelist.ipwhitelist.sourcerange=$WHITELIST"
 
 ### NODES
   geth-goerli:
@@ -48,7 +48,6 @@ services:
       - "traefik.http.routers.geth-goerli.entrypoints=websecure"
       - "traefik.http.routers.geth-goerli.tls.certresolver=myresolver"
       - "traefik.http.routers.geth-goerli.rule=Host(`$HOSTIP`) && PathPrefix(`/goerli`)"
-      - "traefik.http.routers.geth-goerli.middlewares=geth-goerli-stripprefix, auth"
 
   geth-rinkeby:
     image: ethereum/client-go:latest
@@ -67,7 +66,6 @@ services:
       - "traefik.http.routers.geth-rinkeby.entrypoints=websecure"
       - "traefik.http.routers.geth-rinkeby.tls.certresolver=myresolver"
       - "traefik.http.routers.geth-rinkeby.rule=Host(`$HOSTIP`) && PathPrefix(`/rinkeby`)"
-      - "traefik.http.routers.geth-rinkeby.middlewares=geth-rinkeby-stripprefix, auth"
 
   geth-ropsten:
     image: ethereum/client-go:latest
@@ -86,7 +84,6 @@ services:
       - "traefik.http.routers.geth-ropsten.entrypoints=websecure"
       - "traefik.http.routers.geth-ropsten.tls.certresolver=myresolver"
       - "traefik.http.routers.geth-ropsten.rule=Host(`$HOSTIP`) && PathPrefix(`/ropsten`)"
-      - "traefik.http.routers.geth-ropsten.middlewares=geth-ropsten-stripprefix, auth"
 
   geth-mainnet:
     image: ethereum/client-go:latest
@@ -105,7 +102,6 @@ services:
       - "traefik.http.routers.geth-mainnet.entrypoints=websecure"
       - "traefik.http.routers.geth-mainnet.tls.certresolver=myresolver"
       - "traefik.http.routers.geth-mainnet.rule=Host(`$HOSTIP`) && PathPrefix(`/geth`)"
-      - "traefik.http.routers.geth-mainnet.middlewares=geth-mainnet-stripprefix, auth"
 
   erigon-trace:
     image: thorax/erigon
@@ -136,7 +132,6 @@ services:
       - "traefik.http.routers.rpcdaemon.entrypoints=websecure"
       - "traefik.http.routers.rpcdaemon.tls.certresolver=myresolver"
       - "traefik.http.routers.rpcdaemon.rule=Host(`$HOSTIP`) && PathPrefix(`/erigon`)"
-      - "traefik.http.routers.rpcdaemon.middlewares=rpcdaemon-stripprefix, auth"
 
   avalanche:
     image: avaplatform/avalanchego
@@ -155,7 +150,6 @@ services:
       - "traefik.http.routers.avalanche.entrypoints=websecure"
       - "traefik.http.routers.avalanche.tls.certresolver=myresolver"
       - "traefik.http.routers.avalanche.rule=Host(`$HOSTIP`) && PathPrefix(`/avalanche`)"
-      - "traefik.http.routers.avalanche.middlewares=avalanche-stripprefix, auth"
 
   pocket-testnet:
     image: poktnetwork/pocket-core:stagenet-latest
@@ -181,7 +175,6 @@ services:
       - "traefik.http.routers.pocket-testnet.entrypoints=websecure"
       - "traefik.http.routers.pocket-testnet.tls.certresolver=myresolver"
       - "traefik.http.routers.pocket-testnet.rule=Host(`$HOSTIP`) && PathPrefix(`/pokttest`)"
-      - "traefik.http.routers.pocket-testnet.middlewares=pocket-mainnet-stripprefix, auth"
 
   pocket-mainnet:
     image: poktnetwork/pocket-core:stagenet-latest
@@ -208,7 +201,6 @@ services:
       - "traefik.http.routers.pocket-mainnet.entrypoints=websecure"
       - "traefik.http.routers.pocket-mainnet.tls.certresolver=myresolver"
       - "traefik.http.routers.pocket-mainnet.rule=Host(`$HOSTIP`) && PathPrefix(`/pokt`)"
-      - "traefik.http.routers.pocket-mainnet.middlewares=pocket-mainnet-stripprefix, auth"
     restart: unless-stopped